grid: modify argument of input event callback functionsubmit/tizen/20150923.005247accepted/tizen/tv/20150923.052502

Change-Id: I73ade51c1e38323c1c09409d041d1c32604f8a45
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>

6 files changed, 29 insertions, 23 deletions

diff --git a/src/grid/grid_gallery.c b/src/grid/grid_gallery.c
index f1e8ddd..378850f 100644
--- a/src/grid/grid_gallery.c
+++ b/src/grid/grid_gallery.c
@@ -143,8 +143,8 @@ static void _free_media_list(struct datamgr *dmgr, Eina_List *list)
 static void _key_down_cb(void *data, Elm_Object_Item *it,
 			Evas_Event_Key_Down *ev)
 {
+	Eina_List *list;
 	struct view_update_data vdata;
-	struct datamgr *dmgr;
 	app_media *am;
 
 	if (!data || !ev) {
@@ -152,7 +152,7 @@ static void _key_down_cb(void *data, Elm_Object_Item *it,
 		return;
 	}
 
-	dmgr = data;
+	list = data;
 
 	if (!strcmp(ev->keyname, KEY_MENU) ||
 		!strcmp(ev->keyname, KEY_CONTEXT_MENU)) {
@@ -162,7 +162,7 @@ static void _key_down_cb(void *data, Elm_Object_Item *it,
 			return;
 		}
 
-		vdata.list = dmgr->ops->get_list(dmgr->handle);
+		vdata.list = list;
 		vdata.index = util_get_media_index(vdata.list, am);
 
 		viewmgr_update_view(VIEW_ACTION_MENU, UPDATE_CONTENT, &vdata);
@@ -172,8 +172,8 @@ static void _key_down_cb(void *data, Elm_Object_Item *it,
 
 static void _selected_cb(void *data, Elm_Object_Item *it)
 {
+	Eina_List *list;
 	struct view_update_data vdata;
-	struct datamgr *dmgr;
 	app_media *am;
 
 	if (!data || !it) {
@@ -181,7 +181,7 @@ static void _selected_cb(void *data, Elm_Object_Item *it)
 		return;
 	}
 
-	dmgr = data;
+	list = data;
 
 	am = elm_object_item_data_get(it);
 	if (!am) {
@@ -189,7 +189,7 @@ static void _selected_cb(void *data, Elm_Object_Item *it)
 		return;
 	}
 
-	vdata.list = dmgr->ops->get_list(dmgr->handle);
+	vdata.list = list;
 	vdata.index = util_get_media_index(vdata.list, am);
 
 	viewmgr_update_view(VIEW_VIEWER, UPDATE_CONTENT, &vdata);
diff --git a/src/grid/grid_movie.c b/src/grid/grid_movie.c
index 8375d10..c420c81 100644
--- a/src/grid/grid_movie.c
+++ b/src/grid/grid_movie.c
@@ -226,8 +226,8 @@ static void _free_group_list(struct datamgr *dmgr, Eina_List *list)
 static void _key_down_cb(void *data, Elm_Object_Item *it,
 			Evas_Event_Key_Down *ev)
 {
+	Eina_List *list;
 	struct view_update_data vdata;
-	struct datamgr *dmgr;
 	app_media *am;
 
 	if (!data || !ev) {
@@ -235,7 +235,7 @@ static void _key_down_cb(void *data, Elm_Object_Item *it,
 		return;
 	}
 
-	dmgr = data;
+	list = data;
 
 	if (!strcmp(ev->keyname, KEY_MENU) ||
 		!strcmp(ev->keyname, KEY_CONTEXT_MENU)) {
@@ -245,7 +245,7 @@ static void _key_down_cb(void *data, Elm_Object_Item *it,
 			return;
 		}
 
-		vdata.list = dmgr->ops->get_list(dmgr->handle);
+		vdata.list = list;
 		vdata.index = util_get_media_index(vdata.list, am);
 
 		viewmgr_update_view(VIEW_ACTION_MENU, UPDATE_CONTENT, &vdata);
@@ -255,8 +255,8 @@ static void _key_down_cb(void *data, Elm_Object_Item *it,
 
 static void _selected_cb(void *data, Elm_Object_Item *it)
 {
+	Eina_List *list;
 	struct view_update_data vdata;
-	struct datamgr *dmgr;
 	app_media *am;
 
 	if (!data || !it) {
@@ -264,7 +264,7 @@ static void _selected_cb(void *data, Elm_Object_Item *it)
 		return;
 	}
 
-	dmgr = data;
+	list = data;
 
 	am = elm_object_item_data_get(it);
 	if (!am) {
@@ -272,7 +272,7 @@ static void _selected_cb(void *data, Elm_Object_Item *it)
 		return;
 	}
 
-	vdata.list = dmgr->ops->get_list(dmgr->handle);
+	vdata.list = list;
 	vdata.index = util_get_media_index(vdata.list, am);
 
 	viewmgr_update_view(VIEW_VIEWER, UPDATE_CONTENT, &vdata);
diff --git a/src/grid/grid_music.c b/src/grid/grid_music.c
index 9a7ff17..7469bef 100644
--- a/src/grid/grid_music.c
+++ b/src/grid/grid_music.c
@@ -293,8 +293,8 @@ static void _free_group_list(struct datamgr *dmgr, Eina_List *list)
 static void _key_down_cb(void *data, Elm_Object_Item *it,
 			Evas_Event_Key_Down *ev)
 {
+	Eina_List *list;
 	struct view_update_data vdata;
-	struct datamgr *dmgr;
 	app_media *am;
 
 	if (!data || !ev) {
@@ -302,7 +302,7 @@ static void _key_down_cb(void *data, Elm_Object_Item *it,
 		return;
 	}
 
-	dmgr = data;
+	list = data;
 
 	if (!strcmp(ev->keyname, KEY_MENU) ||
 		!strcmp(ev->keyname, KEY_CONTEXT_MENU)) {
@@ -312,7 +312,7 @@ static void _key_down_cb(void *data, Elm_Object_Item *it,
 			return;
 		}
 
-		vdata.list = dmgr->ops->get_list(dmgr->handle);
+		vdata.list = list;
 		vdata.index = util_get_media_index(vdata.list, am);
 
 		viewmgr_update_view(VIEW_ACTION_MENU, UPDATE_CONTENT, &vdata);
@@ -322,8 +322,8 @@ static void _key_down_cb(void *data, Elm_Object_Item *it,
 
 static void _selected_cb(void *data, Elm_Object_Item *it)
 {
+	Eina_List *list;
 	struct view_update_data vdata;
-	struct datamgr *dmgr;
 	app_media *am;
 
 	if (!data || !it) {
@@ -331,7 +331,7 @@ static void _selected_cb(void *data, Elm_Object_Item *it)
 		return;
 	}
 
-	dmgr = data;
+	list = data;
 
 	am = elm_object_item_data_get(it);
 	if (!am) {
@@ -339,7 +339,7 @@ static void _selected_cb(void *data, Elm_Object_Item *it)
 		return;
 	}
 
-	vdata.list = dmgr->ops->get_list(dmgr->handle);
+	vdata.list = list;
 	vdata.index = util_get_media_index(vdata.list, am);
 
 	viewmgr_update_view(VIEW_MPLAYER, UPDATE_CONTENT, &vdata);
diff --git a/src/layout/gallery.c b/src/layout/gallery.c
index 2e7e233..2d90802 100644
--- a/src/layout/gallery.c
+++ b/src/layout/gallery.c
@@ -137,6 +137,7 @@ static void _clear_content_list(struct _priv *priv)
 static void _update_content_list(struct _priv *priv)
 {
 	Eina_List *list;
+	struct datamgr *dmgr;
 
 	if (priv->media_list) {
 		_update_content_info(priv);
@@ -145,14 +146,16 @@ static void _update_content_list(struct _priv *priv)
 
 	priv->gdata = get_gallery_grid_data(priv->view_mode);
 
-	list = priv->gdata->get_item_list(priv->dmgr[E_DATA_MEDIA]);
+	dmgr = priv->dmgr[E_DATA_MEDIA];
+
+	list = priv->gdata->get_item_list(dmgr);
 	if (!list) {
 		elm_object_part_text_set(priv->layout,
 				PART_NOCONTENT, TEXT_NOCONTENT);
 		return;
 	}
 
-	priv->gdata->data = priv->dmgr[E_DATA_MEDIA];
+	priv->gdata->data = dmgr->ops->get_list(dmgr->handle);
 
 	if (!listmgr_update_content_list(priv->listmgr, list, priv->gdata))
 		_ERR("failed to update list area");
diff --git a/src/layout/movie.c b/src/layout/movie.c
index 7dcd61c..a3b7597 100644
--- a/src/layout/movie.c
+++ b/src/layout/movie.c
@@ -349,6 +349,7 @@ static void _clear_content_list(struct _priv *priv)
 static void _update_content_list(struct _priv *priv)
 {
 	Eina_List *list;
+	struct datamgr *dmgr;
 
 	if (priv->media_list) {
 		_update_content_info(priv);
@@ -357,14 +358,16 @@ static void _update_content_list(struct _priv *priv)
 
 	priv->gdata = get_movie_grid_data(priv->view_mode);
 
-	list = priv->gdata->get_item_list(priv->dmgr[E_DATA_MEDIA]);
+	dmgr = priv->dmgr[E_DATA_MEDIA];
+
+	list = priv->gdata->get_item_list(dmgr);
 	if (!list) {
 		elm_object_part_text_set(priv->layout,
 				PART_NOCONTENT, TEXT_NOCONTENT);
 		return;
 	}
 
-	priv->gdata->data = priv->dmgr[E_DATA_MEDIA];
+	priv->gdata->data = dmgr->ops->get_list(dmgr->handle);
 
 	if (!listmgr_update_content_list(priv->listmgr, list, priv->gdata)) {
 		_ERR("failed to update list area");
diff --git a/src/layout/music.c b/src/layout/music.c
index 25d7212..d64c317 100644
--- a/src/layout/music.c
+++ b/src/layout/music.c
@@ -339,7 +339,7 @@ static void _update_content_list(struct _priv *priv)
 		return;
 	}
 
-	priv->gdata->data = dmgr;
+	priv->gdata->data = dmgr->ops->get_list(dmgr->handle);
 
 	if (!listmgr_update_content_list(priv->listmgr, list, priv->gdata))
 		_ERR("failed to update list area");