diff options
| author | Ucan, Emre (ADITG/SW1) <eucan@de.adit-jv.com> | 2016-03-17 15:30:32 +0000 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2016-03-24 11:10:07 +0200 |
| commit | d56b90d948f0f9c151ec43b444f52010005601d5 (patch) | |
| tree | 98bdbc4a66a46b84dad20f3d8170cb3684a23ef4 | |
| parent | 1e344dc2c4b510349e4f133e1bd1a9ee160806e7 (diff) | |
ivi-shell: remove ivi_layout_get_id_of_screen API
ivi-screen does not have an id. IVI layout implementation is using
id of weston output. Therefore, this API is unnecessary.
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Acked-by: Wataru Natsume <wnatsume@jp.adit-jv.com>
| -rw-r--r-- | ivi-shell/ivi-layout-export.h | 8 | ||||
| -rw-r--r-- | ivi-shell/ivi-layout.c | 13 | ||||
| -rw-r--r-- | tests/ivi_layout-internal-test.c | 6 |
3 files changed, 4 insertions, 23 deletions
diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h index 1f756979..4fe0107d 100644 --- a/ivi-shell/ivi-layout-export.h +++ b/ivi-shell/ivi-layout-export.h @@ -658,14 +658,6 @@ struct ivi_layout_interface { void (*layer_remove_notification_by_callback)(struct ivi_layout_layer *ivilayer, layer_property_notification_func callback, void *userdata); - - /** - * \brief get id of ivi_screen from ivi_layout_screen - * - * - * \return id of ivi_screen - */ - uint32_t (*get_id_of_screen)(struct ivi_layout_screen *iviscrn); }; #ifdef __cplusplus diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index 383bd754..17a3fc99 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -1317,12 +1317,6 @@ ivi_layout_get_id_of_layer(struct ivi_layout_layer *ivilayer) return ivilayer->id_layer; } -static uint32_t -ivi_layout_get_id_of_screen(struct ivi_layout_screen *iviscrn) -{ - return iviscrn->output->id; -} - static struct ivi_layout_layer * ivi_layout_get_layer_from_id(uint32_t id_layer) { @@ -2504,12 +2498,7 @@ static struct ivi_layout_interface ivi_layout_interface = { * remove notification by callback on property changes of ivi_surface/layer */ .surface_remove_notification_by_callback = ivi_layout_surface_remove_notification_by_callback, - .layer_remove_notification_by_callback = ivi_layout_layer_remove_notification_by_callback, - - /** - * screen controller interfaces part2 - */ - .get_id_of_screen = ivi_layout_get_id_of_screen + .layer_remove_notification_by_callback = ivi_layout_layer_remove_notification_by_callback }; int diff --git a/tests/ivi_layout-internal-test.c b/tests/ivi_layout-internal-test.c index 06abcaa9..80492d8d 100644 --- a/tests/ivi_layout-internal-test.c +++ b/tests/ivi_layout-internal-test.c @@ -548,16 +548,16 @@ test_screen_id(struct test_context *ctx) { const struct ivi_layout_interface *lyt = ctx->layout_interface; struct ivi_layout_screen **iviscrns; + struct weston_output *output; int32_t screen_length = 0; - uint32_t id_screen; int32_t i; iassert(lyt->get_screens(&screen_length, &iviscrns) == IVI_SUCCEEDED); iassert(screen_length > 0); for (i = 0; i < screen_length; ++i) { - id_screen = lyt->get_id_of_screen(iviscrns[i]); - iassert(lyt->get_screen_from_id(id_screen) == iviscrns[i]); + output = lyt->screen_get_output(iviscrns[i]); + iassert(lyt->get_screen_from_id(output->id) == iviscrns[i]); } if (screen_length > 0) |