From 20312b9c8907ce3bc5715a2b58defab3040158de Mon Sep 17 00:00:00 2001 From: "bhutani.92" Date: Thu, 15 Dec 2016 17:09:13 +0530 Subject: [PATCH] Fixed Code Alignment Change-Id: Ia805cf0df42e29785b67874d0337c60b8fba4fb1 Signed-off-by: bhutani.92 --- src/common/mp-common.c | 2 +- src/view/mp-playlist-detail-view.c | 303 +++++++++++++++---------------------- 2 files changed, 122 insertions(+), 183 deletions(-) diff --git a/src/common/mp-common.c b/src/common/mp-common.c index 57084c7..1bfaab8 100644 --- a/src/common/mp-common.c +++ b/src/common/mp-common.c @@ -712,7 +712,7 @@ void mp_common_show_set_as_view(char *path) } void mp_common_list_set_as_cb(void *data, Evas_Object * obj, - void *event_info) + void *event_info) { EVENT_TRACE(); diff --git a/src/view/mp-playlist-detail-view.c b/src/view/mp-playlist-detail-view.c index 17bcf96..b3aaec9 100644 --- a/src/view/mp-playlist-detail-view.c +++ b/src/view/mp-playlist-detail-view.c @@ -26,22 +26,20 @@ #include static void _mp_playlist_detail_view_tracklist_add_cb(void *data, - Evas_Object * obj, - void *event_info); + Evas_Object * obj, + void *event_info); static void _mp_playlist_detail_view_tracklist_reorder_cb(void *data, - Evas_Object * - obj, - void - *event_info); + Evas_Object * + obj, + void + *event_info); static void _mp_playlist_detail_view_cb(void *data, Evas_Object * obj, - void *event_info) -{ + void *event_info) { elm_naviframe_item_pop(GET_NAVIFRAME); } -static void _mp_playlist_detail_view_destory_cb(void *thiz) -{ +static void _mp_playlist_detail_view_destory_cb(void *thiz) { eventfunc; MpPlaylistDetailView_t *view = thiz; MP_CHECK(view); @@ -53,8 +51,7 @@ static void _mp_playlist_detail_view_destory_cb(void *thiz) free(view); } -int _mp_playlist_detail_view_update(void *thiz) -{ +int _mp_playlist_detail_view_update(void *thiz) { startfunc; MpPlaylistDetailView_t *view = thiz; MP_CHECK_VAL(view, -1); @@ -67,8 +64,7 @@ int _mp_playlist_detail_view_update(void *thiz) static void _mp_playlist_detail_rename_cb(void *data, Evas_Object * obj, - void *event_info) -{ + void *event_info) { eventfunc; struct appdata *ad = mp_util_get_appdata(); @@ -93,9 +89,8 @@ _mp_playlist_detail_rename_cb(void *data, Evas_Object * obj, } static void _mp_playlist_detail_view_normal_more_btn_cb(void *data, - Evas_Object * obj, - void *event_info) -{ + Evas_Object * obj, + void *event_info) { eventfunc; MpPlaylistDetailView_t *view = (MpPlaylistDetailView_t *) data; MP_CHECK(view); @@ -110,65 +105,59 @@ static void _mp_playlist_detail_view_normal_more_btn_cb(void *data, mp_media_info_list_count(MP_TRACK_ALL, NULL, NULL, NULL, 0, &count); if (count > 0) { if ((view->list_type == MP_TRACK_BY_PLAYLIST) - || !strcmp((STR_MP_FAVOURITES), view->name) - || !strcmp(GET_STR(STR_MP_FAVOURITES), view->name)) { + || !strcmp((STR_MP_FAVOURITES), view->name) + || !strcmp(GET_STR(STR_MP_FAVOURITES), view->name)) { /*add tracks */ mp_util_ctxpopup_item_append(view->more_btn_ctxpopup, - STR_MP_ADD_TRACKS, - MP_PLAYER_MORE_BTN_ADD, - _mp_playlist_detail_view_tracklist_add_cb, - view); + STR_MP_ADD_TRACKS, + MP_PLAYER_MORE_BTN_ADD, + _mp_playlist_detail_view_tracklist_add_cb, + view); } if (view->list_type == MP_TRACK_BY_PLAYLIST) { mp_util_ctxpopup_item_append(view->more_btn_ctxpopup, - STR_MP_RENAME, - MP_PLAYER_MORE_BTN_RENAME_IMAGE, - _mp_playlist_detail_rename_cb, - view); + STR_MP_RENAME, + MP_PLAYER_MORE_BTN_RENAME_IMAGE, + _mp_playlist_detail_rename_cb, + view); } if ((mp_list_get_editable_count - (view->content_to_show, MP_LIST_EDIT_TYPE_NORMAL) > 1) - && view->list_type == MP_TRACK_BY_PLAYLIST) { + (view->content_to_show, MP_LIST_EDIT_TYPE_NORMAL) > 1) + && view->list_type == MP_TRACK_BY_PLAYLIST) { /*reorder */ mp_util_ctxpopup_item_append(view->more_btn_ctxpopup, - STR_MP_REORDER, - MP_PLAYER_MORE_BTN_SET_REORDER, - _mp_playlist_detail_view_tracklist_reorder_cb, - view); + STR_MP_REORDER, + MP_PLAYER_MORE_BTN_SET_REORDER, + _mp_playlist_detail_view_tracklist_reorder_cb, + view); } if (mp_list_get_editable_count - (view->content_to_show, MP_LIST_EDIT_TYPE_NORMAL)) { + (view->content_to_show, MP_LIST_EDIT_TYPE_NORMAL)) { /*remove */ mp_util_ctxpopup_item_append(view->more_btn_ctxpopup, - STR_MP_REMOVE, - MP_PLAYER_MORE_BTN_EDIT, - mp_playlist_detail_view_tracklist_edit_cb, - view); + STR_MP_REMOVE, + MP_PLAYER_MORE_BTN_EDIT, + mp_playlist_detail_view_tracklist_edit_cb, + view); } if (count) { /*search */ mp_util_ctxpopup_item_append(view->more_btn_ctxpopup, - STR_MP_SEARCH, NULL, - mp_common_create_search_view_cb, - view); + STR_MP_SEARCH, NULL, + mp_common_create_search_view_cb, + view); } - /*mp_util_ctxpopup_item_append(view->more_btn_ctxpopup, - STR_MP_SETTINGS, MP_PLAYER_MORE_BTN_SETTING, mp_common_ctxpopup_setting_cb, view); */ #ifndef MP_FEATURE_NO_END mp_util_ctxpopup_item_append(view->more_btn_ctxpopup, - STR_MP_END, - MP_PLAYER_MORE_BTN_VIEW_END, - mp_common_ctxpopup_end_cb, view); + STR_MP_END, + MP_PLAYER_MORE_BTN_VIEW_END, + mp_common_ctxpopup_end_cb, view); #endif - /* - mp_util_ctxpopup_item_append(view->more_btn_ctxpopup, - GET_SYS_STR(STR_MP_END), MP_PLAYER_MORE_BTN_VIEW_END, mp_common_ctxpopup_end_cb, view); - */ mp_util_more_btn_move_ctxpopup(view->more_btn_ctxpopup, obj); @@ -176,10 +165,10 @@ static void _mp_playlist_detail_view_normal_more_btn_cb(void *data, } else { if (view->list_type == MP_TRACK_BY_PLAYLIST) { mp_util_ctxpopup_item_append(view->more_btn_ctxpopup, - STR_MP_RENAME, - MP_PLAYER_MORE_BTN_RENAME_IMAGE, - _mp_playlist_detail_rename_cb, - view); + STR_MP_RENAME, + MP_PLAYER_MORE_BTN_RENAME_IMAGE, + _mp_playlist_detail_rename_cb, + view); mp_util_more_btn_move_ctxpopup(view->more_btn_ctxpopup, obj); evas_object_show(view->more_btn_ctxpopup); @@ -189,19 +178,12 @@ static void _mp_playlist_detail_view_normal_more_btn_cb(void *data, /*************** functions for track list update *******************/ void mp_playlist_detail_view_tracklist_edit_cb(void *data, - Evas_Object * obj, - void *event_info) -{ + Evas_Object * obj, + void *event_info) { eventfunc; MpPlaylistDetailView_t *view = (MpPlaylistDetailView_t *) data; MP_CHECK(view); - /* - if (view->list_type == MP_TRACK_BY_PLAYLIST) { - mp_list_set_reorder((MpList_t *)view->content_to_show, TRUE); - - } - */ view->content_to_show->reorderable = 0; mp_evas_object_del(view->more_btn_ctxpopup); @@ -209,10 +191,9 @@ void mp_playlist_detail_view_tracklist_edit_cb(void *data, } static void _mp_playlist_detail_view_tracklist_reorder_cb(void *data, - Evas_Object * - obj, - void *event_info) -{ + Evas_Object * + obj, + void *event_info) { eventfunc; MpPlaylistDetailView_t *view = (MpPlaylistDetailView_t *) data; MP_CHECK(view); @@ -223,48 +204,16 @@ static void _mp_playlist_detail_view_tracklist_reorder_cb(void *data, } static void _mp_playlist_detail_view_tracklist_add_cb(void *data, - Evas_Object * obj, - void *event_info) -{ + Evas_Object * obj, + void *event_info) { eventfunc; MpPlaylistDetailView_t *parent_view = (MpPlaylistDetailView_t *) data; MP_CHECK(parent_view); mp_common_show_add_tracks_view(parent_view->p_id); } -/*static Eina_Bool _mp_playlist_detail_view_back_cb(void *data, Elm_Object_Item *it) -{ - eventfunc; - MpPlaylistDetailView_t *view = (MpPlaylistDetailView_t *) data; - MP_CHECK_VAL(view, EINA_TRUE); - - MpTrackList_t *track_list = (MpTrackList_t *)view->content_to_show; - MP_CHECK_VAL(track_list, EINA_TRUE); - - ERROR_TRACE("track_list->reorderable = %d",track_list->reorderable); - - if (track_list->reorderable == 1) { - mp_list_set_reorder((MpList_t *)track_list, FALSE); - } - - if (track_list->edit_mode == 1) { - mp_list_set_edit((MpList_t *)track_list, FALSE); - mp_list_view_set_select_all((MpListView_t *)view, FALSE); - mp_view_update_options((MpView_t *)view); - mp_evas_object_del(view->selection_info); - return EINA_FALSE; - } else { - DEBUG_TRACE(""); - MpViewMgr_t *view_mgr = mp_view_mgr_get_view_manager(); - mp_view_mgr_pop_view(view_mgr, false); - mp_view_mgr_post_event(GET_VIEW_MGR, MP_UPDATE_FAVORITE_LIST); - } - return EINA_TRUE; -}*/ - static Eina_Bool _mp_playlist_detail_view_pop_cb(void *data, - Elm_Object_Item * it) -{ + Elm_Object_Item * it) { startfunc; MpPlaylistDetailView_t *view = (MpPlaylistDetailView_t *) data; MP_CHECK_VAL(view, EINA_TRUE); @@ -274,8 +223,7 @@ static Eina_Bool _mp_playlist_detail_view_pop_cb(void *data, return EINA_TRUE; } -static int _mp_playlist_detail_view_update_options(void *thiz) -{ +static int _mp_playlist_detail_view_update_options(void *thiz) { startfunc; MpPlaylistDetailView_t *view = (MpPlaylistDetailView_t *) thiz; MP_CHECK_VAL(view, -1); @@ -283,81 +231,76 @@ static int _mp_playlist_detail_view_update_options(void *thiz) Evas_Object *btn = NULL; btn = - mp_widget_create_toolbar_btn(view->playlist_detail_view_layout, - MP_TOOLBAR_BTN_MORE, NULL, - _mp_playlist_detail_view_normal_more_btn_cb, - view); + mp_widget_create_toolbar_btn(view->playlist_detail_view_layout, + MP_TOOLBAR_BTN_MORE, NULL, + _mp_playlist_detail_view_normal_more_btn_cb, + view); elm_object_item_part_content_set(view->navi_it, "toolbar_more_btn", - btn); + btn); /*view->toolbar_options[MP_OPTION_MORE] = btn; elm_naviframe_item_pop_cb_set(view->navi_it, _mp_playlist_detail_view_back_cb, view); */ Evas_Object *back_button = - elm_button_add(view->playlist_detail_view_layout); + elm_button_add(view->playlist_detail_view_layout); elm_object_style_set(back_button, "naviframe/end_btn/default"); elm_object_item_part_content_set(view->navi_it, "prev_btn", - back_button); + back_button); evas_object_smart_callback_add(back_button, "clicked", - _mp_playlist_detail_view_cb, view); + _mp_playlist_detail_view_cb, view); elm_naviframe_item_pop_cb_set(view->navi_it, - _mp_playlist_detail_view_pop_cb, view); + _mp_playlist_detail_view_pop_cb, view); - /* update the first controlbar item */ - /* mp_view_manager_update_first_controlbar_item(layout_data); */ endfunc; return 0; } -static void _mp_playlist_detail_view_content_load(void *thiz) -{ +static void _mp_playlist_detail_view_content_load(void *thiz) { startfunc; Evas_Object *content = NULL; MpPlaylistDetailView_t *view = (MpPlaylistDetailView_t *) thiz; MP_CHECK(view); view->content_to_show = - (MpList_t *) mp_track_list_create(view->layout); + (MpList_t *) mp_track_list_create(view->layout); if (view->list_type == MP_TRACK_BY_PLAYLIST) { DEBUG_TRACE("playlist id: %d", view->p_id); mp_track_list_set_data((MpTrackList_t *) view->content_to_show, - MP_TRACK_LIST_TYPE, view->list_type, - MP_TRACK_LIST_PLAYLIT_ID, view->p_id, -1); + MP_TRACK_LIST_TYPE, view->list_type, + MP_TRACK_LIST_PLAYLIT_ID, view->p_id, -1); } else { mp_track_list_set_data((MpTrackList_t *) view->content_to_show, - MP_TRACK_LIST_TYPE, view->list_type, -1); + MP_TRACK_LIST_TYPE, view->list_type, -1); } - /*mp_track_list_set_data((MpTrackList_t *)view->content_to_show, MP_TRACK_LIST_INDEX_TYPE, MP_TRACK_LIST_INDEX_ALBUM_ART_LIST, -1); */ mp_list_update(view->content_to_show); content = mp_list_get_layout(view->content_to_show); if (content != NULL) { elm_object_part_content_set(view->playlist_detail_view_layout, - "list_content", content); + "list_content", content); } } static void -_mp_playlist_detail_view_on_event_cb(void *thiz, MpViewEvent_e event) -{ +_mp_playlist_detail_view_on_event_cb(void *thiz, MpViewEvent_e event) { MpPlaylistDetailView_t *view = thiz; MP_CHECK(view); mp_debug("event = %d", event); switch (event) { case MP_ADD_TO_PLAYLIST_DONE:{ - int count = + int count = mp_list_get_editable_count((MpList_t *) view-> - content_to_show, - mp_list_get_edit_type(view-> - content_to_show)); - if (count != 0) { - mp_track_list_update_albumart_index((MpTrackList_t *) - view->content_to_show); - } - break; + content_to_show, + mp_list_get_edit_type(view-> + content_to_show)); + if (count != 0) { + mp_track_list_update_albumart_index((MpTrackList_t *) + view->content_to_show); } + break; + } case MP_DELETE_DONE: case MP_PLAYLIST_REORDER_DONE: mp_list_update(view->content_to_show); @@ -367,61 +310,61 @@ _mp_playlist_detail_view_on_event_cb(void *thiz, MpViewEvent_e event) mp_track_list_update_genlist(view->content_to_show); break; case MP_UPDATE_FAVORITE_LIST:{ - mp_list_update(view->content_to_show); - break; - } + mp_list_update(view->content_to_show); + break; + } #ifndef MP_SOUND_PLAYER case MP_UPDATE_PLAYING_LIST: mp_list_realized_item_part_update(view->content_to_show, - "elm.text.main.left.top", - ELM_GENLIST_ITEM_FIELD_TEXT); + "elm.text.main.left.top", + ELM_GENLIST_ITEM_FIELD_TEXT); mp_list_realized_item_part_update(view->content_to_show, - "elm.text.sub.left.bottom", - ELM_GENLIST_ITEM_FIELD_TEXT); + "elm.text.sub.left.bottom", + ELM_GENLIST_ITEM_FIELD_TEXT); break; #endif case MP_PLAY_TIME_COUNT_UPDATED:{ - if (view->p_id == MP_SYS_PLST_RECENTELY_PLAYED || + if (view->p_id == MP_SYS_PLST_RECENTELY_PLAYED || view->p_id == MP_SYS_PLST_MOST_PLAYED) { - Evas_Object *content = NULL; - content = + Evas_Object *content = NULL; + content = elm_object_part_content_unset(view-> - playlist_detail_view_layout, - "list-content"); - evas_object_del(content); - mp_list_update(view->content_to_show); - int count = + playlist_detail_view_layout, + "list-content"); + evas_object_del(content); + mp_list_update(view->content_to_show); + int count = mp_list_get_editable_count((MpList_t *) view-> - content_to_show, - mp_list_get_edit_type(view-> - content_to_show)); - if (count != 0) { - mp_track_list_update_albumart_index((MpTrackList_t *) - view-> - content_to_show); - } + content_to_show, + mp_list_get_edit_type(view-> + content_to_show)); + if (count != 0) { + mp_track_list_update_albumart_index((MpTrackList_t *) + view-> + content_to_show); } - break; } + break; + } case MP_VIEW_EVENT_ALBUMART_CHANGED: mp_list_realized_item_part_update(view->content_to_show, - "elm.icon", - ELM_GENLIST_ITEM_FIELD_CONTENT); + "elm.icon", + ELM_GENLIST_ITEM_FIELD_CONTENT); break; case MP_VIEW_TRANSITION_FINISHED: mp_view_mgr_post_event(GET_VIEW_MGR, MP_PLAYLIST_CREATED); -// eext_object_event_callback_add(GET_VIEW_MGR->navi, EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL); + // eext_object_event_callback_add(GET_VIEW_MGR->navi, EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL); break; case MP_START_PLAYBACK: case MP_RESUME_PLAYBACK: case MP_PAUSE_PLAYBACK: case MP_PLAYING_TRACK_CHANGED: case MP_STOP_PLAYBACK:{ - mp_list_realized_item_part_update(view->content_to_show, - "elm.icon.left", - ELM_GENLIST_ITEM_FIELD_CONTENT); - break; - } + mp_list_realized_item_part_update(view->content_to_show, + "elm.icon.left", + ELM_GENLIST_ITEM_FIELD_CONTENT); + break; + } default: break; } @@ -429,8 +372,7 @@ _mp_playlist_detail_view_on_event_cb(void *thiz, MpViewEvent_e event) endfunc; } -static void _mp_playlist_detail_view_resume(void *thiz) -{ +static void _mp_playlist_detail_view_resume(void *thiz) { startfunc; MpPlaylistDetailView_t *view = (MpPlaylistDetailView_t *) thiz; mp_view_freeze_nowplaying((MpView_t *) thiz, 0); @@ -444,13 +386,12 @@ static void _mp_playlist_detail_view_resume(void *thiz) static int _mp_playlist_detail_view_init(Evas_Object * parent, - MpPlaylistDetailView_t * view) -{ + MpPlaylistDetailView_t * view) { startfunc; int ret = 0; ret = - mp_list_view_init(parent, (MpListView_t *) view, - MP_VIEW_PLAYLIST_DETAIL); + mp_list_view_init(parent, (MpListView_t *) view, + MP_VIEW_PLAYLIST_DETAIL); MP_CHECK_VAL(ret == 0, -1); view->update = _mp_playlist_detail_view_update; @@ -468,18 +409,17 @@ _mp_playlist_detail_view_init(Evas_Object * parent, } MpPlaylistDetailView_t *mp_playlist_detail_view_create(Evas_Object * - parent, - mp_track_type_e - list_type, - char *name, - int p_id) -{ + parent, + mp_track_type_e + list_type, + char *name, + int p_id) { eventfunc; int ret; MP_CHECK_NULL(parent); MpPlaylistDetailView_t *view = - calloc(1, sizeof(MpPlaylistDetailView_t)); + calloc(1, sizeof(MpPlaylistDetailView_t)); MP_CHECK_NULL(view); ret = _mp_playlist_detail_view_init(parent, view); @@ -493,14 +433,13 @@ MpPlaylistDetailView_t *mp_playlist_detail_view_create(Evas_Object * view->content_set(view); return view; - Error: + Error: ERROR_TRACE("Error: mp_playlist_detail_view_create()"); IF_FREE(view); return NULL; } -int mp_playlist_detail_view_destory(MpPlaylistDetailView_t * view) -{ +int mp_playlist_detail_view_destory(MpPlaylistDetailView_t * view) { startfunc; MP_CHECK_VAL(view, -1); -- 2.7.4