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 /ivi-shell | |
| 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>
Diffstat (limited to 'ivi-shell')
| -rw-r--r-- | ivi-shell/ivi-layout-export.h | 8 | ||||
| -rw-r--r-- | ivi-shell/ivi-layout.c | 13 |
2 files changed, 1 insertions, 20 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 |