From 1e344dc2c4b510349e4f133e1bd1a9ee160806e7 Mon Sep 17 00:00:00 2001 From: "Ucan, Emre (ADITG/SW1)" Date: Thu, 17 Mar 2016 15:30:27 +0000 Subject: [PATCH] ivi-shell: remove id_screen use output id instead Signed-off-by: Emre Ucan Reviewed-by: Pekka Paalanen Acked-by: Wataru Natsume --- ivi-shell/ivi-layout.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index 437ba22f..383bd754 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -80,7 +80,6 @@ struct ivi_layout; struct ivi_layout_screen { struct wl_list link; - uint32_t id_screen; struct ivi_layout *layout; struct weston_output *output; @@ -249,7 +248,6 @@ create_screen(struct weston_compositor *ec) struct ivi_layout *layout = get_instance(); struct ivi_layout_screen *iviscrn = NULL; struct weston_output *output = NULL; - int32_t count = 0; wl_list_for_each(output, &ec->output_list, link) { iviscrn = calloc(1, sizeof *iviscrn); @@ -260,9 +258,6 @@ create_screen(struct weston_compositor *ec) iviscrn->layout = layout; - iviscrn->id_screen = count; - count++; - iviscrn->output = output; wl_list_init(&iviscrn->pending.layer_list); @@ -1325,7 +1320,7 @@ ivi_layout_get_id_of_layer(struct ivi_layout_layer *ivilayer) static uint32_t ivi_layout_get_id_of_screen(struct ivi_layout_screen *iviscrn) { - return iviscrn->id_screen; + return iviscrn->output->id; } static struct ivi_layout_layer * @@ -1365,7 +1360,7 @@ ivi_layout_get_screen_from_id(uint32_t id_screen) struct ivi_layout_screen *iviscrn = NULL; wl_list_for_each(iviscrn, &layout->screen_list, link) { - if (iviscrn->id_screen == id_screen) + if (iviscrn->output->id == id_screen) return iviscrn; }