[PATCH weston 7/8] ivi-shell: remove ivi_layout_get_screen_from_id API

Ucan, Emre (ADITG/SW1) eucan at de.adit-jv.com
Thu Mar 17 15:30:49 UTC 2016


The controller plugins does not use ivi screens for IVI layout APIs.
They use weston outputs directly. Therefore, this API is unnecessary.

Signed-off-by: Emre Ucan <eucan at de.adit-jv.com>
---
 ivi-shell/ivi-layout-export.h |   10 ----------
 ivi-shell/ivi-layout.c        |   17 +----------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
index 249ea16..4fee978 100644
--- a/ivi-shell/ivi-layout-export.h
+++ b/ivi-shell/ivi-layout-export.h
@@ -558,16 +558,6 @@ struct ivi_layout_interface {
 	 */
 
 	/**
-	 * \brief get ivi_layout_screen from id of ivi_screen
-	 *
-	 * \return (struct ivi_layout_screen *)
-	 *              if the method call was successful
-	 * \return NULL if the method call was failed
-	 */
-	struct ivi_layout_screen *
-		(*get_screen_from_id)(uint32_t id_screen);
-
-	/**
 	 * \brief Get the weston_outputs under the given ivi_layer
 	 *
 	 * \return IVI_SUCCEEDED if the method call was successful
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index 798049a..f1ee2db 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -1361,20 +1361,6 @@ ivi_layout_get_surface_from_id(uint32_t id_surface)
 	return NULL;
 }
 
-static struct ivi_layout_screen *
-ivi_layout_get_screen_from_id(uint32_t id_screen)
-{
-	struct ivi_layout *layout = get_instance();
-	struct ivi_layout_screen *iviscrn = NULL;
-
-	wl_list_for_each(iviscrn, &layout->screen_list, link) {
-		if (iviscrn->output->id == id_screen)
-			return iviscrn;
-	}
-
-	return NULL;
-}
-
 static int32_t
 ivi_layout_surface_add_notification(struct ivi_layout_surface *ivisurf,
 				    surface_property_notification_func callback,
@@ -2444,9 +2430,8 @@ static struct ivi_layout_interface ivi_layout_interface = {
 	.layer_set_transition			= ivi_layout_layer_set_transition,
 
 	/**
-	 * screen controller interfaces part1
+	 * screen controller interfaces
 	 */
-	.get_screen_from_id		= ivi_layout_get_screen_from_id,
 	.get_screens_under_layer	= ivi_layout_get_screens_under_layer,
 	.screen_add_layer		= ivi_layout_screen_add_layer,
 	.screen_set_render_order	= ivi_layout_screen_set_render_order,
-- 
1.7.9.5



More information about the wayland-devel mailing list