diff options
| author | Ucan, Emre (ADITG/SW1) <eucan@de.adit-jv.com> | 2016-03-14 15:42:29 +0000 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2016-03-15 14:25:09 +0200 |
| commit | 193e301c740b582f20307e3e08f8373d26ea968f (patch) | |
| tree | a64fa6e3516f8f81fc98fee0a820d73b99036d27 | |
| parent | dada6e3b79aa9219f431a212877ab5391ef72d13 (diff) | |
ivi-shell: remove content_observer notification
The content observer notification struct and its
set API (ivi_layout_surface_set_content_observer)
are removed. Because they are unused.
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
| -rw-r--r-- | ivi-shell/ivi-layout-export.h | 11 | ||||
| -rw-r--r-- | ivi-shell/ivi-layout-private.h | 5 | ||||
| -rw-r--r-- | ivi-shell/ivi-layout.c | 16 |
3 files changed, 0 insertions, 32 deletions
diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h index 85bf91ab..1f756979 100644 --- a/ivi-shell/ivi-layout-export.h +++ b/ivi-shell/ivi-layout-export.h @@ -321,17 +321,6 @@ struct ivi_layout_interface { enum wl_output_transform orientation); /** - * \brief Set an observer callback for ivi_surface content status change. - * - * \return IVI_SUCCEEDED if the method call was successful - * \return IVI_FAILED if the method call was failed - */ - int32_t (*surface_set_content_observer)( - struct ivi_layout_surface *ivisurf, - ivi_controller_surface_content_callback callback, - void* userdata); - - /** * \brief register for notification on property changes of 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 8c847e7e..2edbae85 100644 --- a/ivi-shell/ivi-layout-private.h +++ b/ivi-shell/ivi-layout-private.h @@ -54,11 +54,6 @@ struct ivi_layout_surface { struct wl_list layer_list; } order; - struct { - ivi_controller_surface_content_callback callback; - void *userdata; - } content_observer; - struct wl_signal configured; }; diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index 61897ef8..77578d45 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -2394,21 +2394,6 @@ ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf, ivisurf); } -static int32_t -ivi_layout_surface_set_content_observer(struct ivi_layout_surface *ivisurf, - ivi_controller_surface_content_callback callback, - void* userdata) -{ - int32_t ret = IVI_FAILED; - - if (ivisurf != NULL) { - ivisurf->content_observer.callback = callback; - ivisurf->content_observer.userdata = userdata; - ret = IVI_SUCCEEDED; - } - return ret; -} - struct ivi_layout_surface* ivi_layout_surface_create(struct weston_surface *wl_surface, uint32_t id_surface) @@ -2530,7 +2515,6 @@ static struct ivi_layout_interface ivi_layout_interface = { .surface_set_source_rectangle = ivi_layout_surface_set_source_rectangle, .surface_set_destination_rectangle = ivi_layout_surface_set_destination_rectangle, .surface_set_orientation = ivi_layout_surface_set_orientation, - .surface_set_content_observer = ivi_layout_surface_set_content_observer, .surface_add_notification = ivi_layout_surface_add_notification, .surface_remove_notification = ivi_layout_surface_remove_notification, .surface_get_weston_surface = ivi_layout_surface_get_weston_surface, |