mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ivi-shell: remove ivi_layout_get_id_of_screen API

Browse Source 
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>
This commit is contained in:
Ucan, Emre (ADITG/SW1)
2016-03-17 15:30:32 +00:00
committed by Pekka Paalanen
parent 1e344dc2c4
commit d56b90d948
3 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ivi-shell/ivi-layout-export.h
-8
View File
@@ -658,14 +658,6 @@ struct ivi_layout_interface {
void (*layer_remove_notification_by_callback)(struct ivi_layout_layer *ivilayer, void (*layer_remove_notification_by_callback)(struct ivi_layout_layer *ivilayer,
layer_property_notification_func callback, layer_property_notification_func callback,
void *userdata); 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 #ifdef __cplusplus
ivi-shell/ivi-layout.c
+1 -12
View File
@@ -1317,12 +1317,6 @@ ivi_layout_get_id_of_layer(struct ivi_layout_layer *ivilayer)
return ivilayer->id_layer; 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 * static struct ivi_layout_layer *
ivi_layout_get_layer_from_id(uint32_t id_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 * remove notification by callback on property changes of ivi_surface/layer
*/ */
.surface_remove_notification_by_callback = ivi_layout_surface_remove_notification_by_callback, .surface_remove_notification_by_callback = ivi_layout_surface_remove_notification_by_callback,
.layer_remove_notification_by_callback = ivi_layout_layer_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
}; };
int int
tests/ivi_layout-internal-test.c
+3 -3
View File
@@ -548,16 +548,16 @@ test_screen_id(struct test_context *ctx)
{ {
const struct ivi_layout_interface *lyt = ctx->layout_interface; const struct ivi_layout_interface *lyt = ctx->layout_interface;
struct ivi_layout_screen **iviscrns; struct ivi_layout_screen **iviscrns;
struct weston_output *output;
int32_t screen_length = 0; int32_t screen_length = 0;
uint32_t id_screen;
int32_t i; int32_t i;
iassert(lyt->get_screens(&screen_length, &iviscrns) == IVI_SUCCEEDED); iassert(lyt->get_screens(&screen_length, &iviscrns) == IVI_SUCCEEDED);
iassert(screen_length > 0); iassert(screen_length > 0);
for (i = 0; i < screen_length; ++i) { for (i = 0; i < screen_length; ++i) {
id_screen = lyt->get_id_of_screen(iviscrns[i]); output = lyt->screen_get_output(iviscrns[i]);
iassert(lyt->get_screen_from_id(id_screen) == iviscrns[i]); iassert(lyt->get_screen_from_id(output->id) == iviscrns[i]);
} }
if (screen_length > 0) if (screen_length > 0)