diff options
| author | Ucan, Emre \(ADITG/SW1\) <eucan@de.adit-jv.com> | 2016-03-04 12:50:28 +0000 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2016-03-04 10:33:34 -0800 |
| commit | c507f67f9ea964159f74c4155f7aaa081600be7a (patch) | |
| tree | 29612b53cc56c5437906166d5510a3c269f5a5ea /ivi-shell | |
| parent | dfc2d76432fd0b84168903c77afa7f7f2cc68a1d (diff) | |
| download | weston-c507f67f9ea964159f74c4155f7aaa081600be7a.tar.gz | |
ivi-shell: remove ivi_layout_surface_get_dimension API
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Acked-by: wataru_natsume <wataru_natsume@xddp.denso.co.jp>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Diffstat (limited to 'ivi-shell')
| -rw-r--r-- | ivi-shell/ivi-layout-export.h | 9 | ||||
| -rw-r--r-- | ivi-shell/ivi-layout-private.h | 3 | ||||
| -rw-r--r-- | ivi-shell/ivi-layout.c | 16 | ||||
| -rw-r--r-- | ivi-shell/ivi-shell.c | 7 |
4 files changed, 2 insertions, 33 deletions
diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h index 6428ef01..b5c66279 100644 --- a/ivi-shell/ivi-layout-export.h +++ b/ivi-shell/ivi-layout-export.h @@ -330,15 +330,6 @@ struct ivi_layout_interface { int32_t dest_width, int32_t dest_height); /** - * \brief Get the horizontal and vertical dimension of the surface. - * - * \return IVI_SUCCEEDED if the method call was successful - * \return IVI_FAILED if the method call was failed - */ - int32_t (*surface_get_dimension)(struct ivi_layout_surface *ivisurf, - int32_t *dest_width, int32_t *dest_height); - - /** * \brief Sets the orientation of a ivi_surface. * * \return IVI_SUCCEEDED if the method call was successful diff --git a/ivi-shell/ivi-layout-private.h b/ivi-shell/ivi-layout-private.h index 913bb0cb..f0dba913 100644 --- a/ivi-shell/ivi-layout-private.h +++ b/ivi-shell/ivi-layout-private.h @@ -171,9 +171,6 @@ ivi_layout_surface_create(struct weston_surface *wl_surface, uint32_t id_surface); void ivi_layout_init_with_compositor(struct weston_compositor *ec); -int32_t -ivi_layout_surface_get_dimension(struct ivi_layout_surface *ivisurf, - int32_t *dest_width, int32_t *dest_height); void ivi_layout_surface_add_configured_listener(struct ivi_layout_surface* ivisurf, struct wl_listener* listener); diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index 563b486f..27cc270c 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -2102,21 +2102,6 @@ ivi_layout_surface_set_dimension(struct ivi_layout_surface *ivisurf, return IVI_SUCCEEDED; } -int32_t -ivi_layout_surface_get_dimension(struct ivi_layout_surface *ivisurf, - int32_t *dest_width, int32_t *dest_height) -{ - if (ivisurf == NULL || dest_width == NULL || dest_height == NULL) { - weston_log("ivi_layout_surface_get_dimension: invalid argument\n"); - return IVI_FAILED; - } - - *dest_width = ivisurf->prop.dest_width; - *dest_height = ivisurf->prop.dest_height; - - return IVI_SUCCEEDED; -} - static int32_t ivi_layout_surface_set_position(struct ivi_layout_surface *ivisurf, int32_t dest_x, int32_t dest_y) @@ -2676,7 +2661,6 @@ static struct ivi_layout_interface ivi_layout_interface = { .surface_set_destination_rectangle = ivi_layout_surface_set_destination_rectangle, .surface_set_position = ivi_layout_surface_set_position, .surface_set_dimension = ivi_layout_surface_set_dimension, - .surface_get_dimension = ivi_layout_surface_get_dimension, .surface_set_orientation = ivi_layout_surface_set_orientation, .surface_get_orientation = ivi_layout_surface_get_orientation, .surface_set_content_observer = ivi_layout_surface_set_content_observer, diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c index a767ccf1..19140cea 100644 --- a/ivi-shell/ivi-shell.c +++ b/ivi-shell/ivi-shell.c @@ -88,11 +88,8 @@ surface_configure_notify(struct wl_listener *listener, void *data) struct ivi_shell_surface, configured_listener); - int32_t dest_width = 0; - int32_t dest_height = 0; - - ivi_layout_surface_get_dimension(layout_surf, - &dest_width, &dest_height); + int32_t dest_width = layout_surf->prop.dest_width; + int32_t dest_height = layout_surf->prop.dest_height; if (shell_surf->resource) ivi_surface_send_configure(shell_surf->resource, |