From 1c04d7b897227be4c5e78d0bc67f4b4e8afb0453 Mon Sep 17 00:00:00 2001 From: "Ucan, Emre (ADITG/SW1)" Date: Thu, 17 Mar 2016 15:30:50 +0000 Subject: [PATCH] ivi-shell: remove ivi_layout_get_screen_output API The controller plugins use IVI Layout API with weston outputs. Therefore, this API is not required. Signed-off-by: Emre Ucan Reviewed-by: Pekka Paalanen Acked-by: Wataru Natsume --- ivi-shell/ivi-layout-export.h | 10 ---------- ivi-shell/ivi-layout.c | 7 ------- 2 files changed, 17 deletions(-) diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h index 4fee9780..93eb504a 100644 --- a/ivi-shell/ivi-layout-export.h +++ b/ivi-shell/ivi-layout-export.h @@ -587,16 +587,6 @@ struct ivi_layout_interface { struct ivi_layout_layer **pLayer, const int32_t number); - /** - * \brief get weston_output from ivi_layout_screen. - * - * \return (struct weston_output *) - * if the method call was successful - * \return NULL if the method call was failed - */ - struct weston_output *(*screen_get_output)(struct ivi_layout_screen *); - - /** * transision animation for layer */ diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index f1ee2dbc..5d68d4b6 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -2012,12 +2012,6 @@ ivi_layout_screen_set_render_order(struct weston_output *output, return IVI_SUCCEEDED; } -static struct weston_output * -ivi_layout_screen_get_output(struct ivi_layout_screen *iviscrn) -{ - return iviscrn->output; -} - /** * This function is used by the additional ivi-module because of dumping ivi_surface sceenshot. * The ivi-module, e.g. ivi-controller.so, is in wayland-ivi-extension of Genivi's Layer Management. @@ -2435,7 +2429,6 @@ static struct ivi_layout_interface ivi_layout_interface = { .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, - .screen_get_output = ivi_layout_screen_get_output, /** * animation