[PATCH weston] ivi-shell: remove content_observer notification
Ucan, Emre (ADITG/SW1)
eucan at de.adit-jv.com
Mon Mar 14 15:42:29 UTC 2016
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 at de.adit-jv.com>
---
ivi-shell/ivi-layout-export.h | 11 -----------
ivi-shell/ivi-layout-private.h | 5 -----
ivi-shell/ivi-layout.c | 16 ----------------
3 files changed, 32 deletions(-)
diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
index 62fee07..dade418 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 3a23ef4..86ba376 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 7b831e0..b8829f7 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -2332,21 +2332,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)
@@ -2468,7 +2453,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,
--
1.7.9.5
More information about the wayland-devel
mailing list