[Code Cleanup] Removed unused code 56/103456/2
authorbhutani.92 <bhutani.92@samsung.com>
Thu, 8 Dec 2016 10:54:53 +0000 (16:24 +0530)
committerbhutani.92 <bhutani.92@samsung.com>
Thu, 8 Dec 2016 11:15:49 +0000 (16:45 +0530)
Change-Id: Ia4cbc7551df433d7d095b390d33e28b6d45ed914
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>
src/common/mp-edit-callback.c
src/common/mp-media-info.c
src/common/mp-util.c
src/core/include/mp-playlist-mgr.h
src/core/mp-playlist-mgr.c
src/include/mp-define.h
src/include/mp-player-debug.h
src/include/music.h
src/mp-main.c
src/view/mp-detail-view.c

index 58c9b6c..76d8425 100644 (file)
@@ -547,7 +547,6 @@ _delete_group(mp_media_info_h item_handle)
 
        IF_FREE(title);
        ecore_thread_feedback(g_edit_thread, (void *)MP_EDIT_THREAD_FEEDBACK_TRACK_DELETED);
-       //mp_view_mgr_post_event(GET_VIEW_MGR, MP_DELETE_DONE);
        mp_media_info_list_destroy(group_track_handle);
        return ret;
 }
@@ -740,7 +739,6 @@ static Eina_Bool _del_old_playlist_detail_view_cb(void *data)
        MpView_t *view = (MpView_t *)data;
        if (view) {
                elm_object_item_del(view->navi_it); //elm_naviframe_item_pop does not work
-               //mp_view_mgr_pop_a_view(GET_VIEW_MGR, view);
        }
 
        mp_view_mgr_post_event(GET_VIEW_MGR, MP_ADD_TO_PLAYLIST_DONE);
@@ -955,7 +953,6 @@ _mp_edit_cb_delete_track_thread(void *data, Ecore_Thread *thread)
        ecore_thread_feedback(thread, (void *)MP_EDIT_THREAD_FEEDBACK_TRACK_DELETED);
 
        //To make progress popup visible if only one item deleted.
-//     usleep(1000000);
        mp_media_info_disconnect();
 }
 
@@ -992,8 +989,6 @@ _mp_edit_cb_delete_track_thread_notify_cb(void *data, Ecore_Thread *thread, void
                */
                mp_playlist_mgr_item_remove_deleted_item(ad->playlist_mgr);
                mp_play_destory(ad);
-
-               //mp_play_new_file(ad, true);
                break;
        default:
                break;
@@ -1291,14 +1286,12 @@ _move_folder(mp_media_info_h item_handle)
 
        char *path = NULL;
        mp_media_info_group_get_sub_info(item_handle, &path);
-       //DEBUG_TRACE("------------>path is %s", path);
 
        char *folder_id = NULL;
        mp_media_info_group_get_folder_id(item_handle, &folder_id);
 
        char *root_path = NULL;
        _mp_edit_cb_get_root_path_by_full(path, &root_path);
-       //DEBUG_TRACE("------------>root_path is %s", root_path);
 
        char *dest = NULL;
        if (mp_util_is_in_personal_page((const char *)path)) {
@@ -1340,14 +1333,11 @@ _move_folder(mp_media_info_h item_handle)
                } else { /*2. other folder*/
                        char *related_path = NULL;
                        _mp_edit_cb_get_logical_path_by_full(path, &related_path);
-                       //DEBUG_TRACE("------------>related_path is %s", related_path);
 
                        char **dir_levels = g_strsplit(related_path + 1, "/", 0);
                        char *dir_name = g_strdup(dir_levels[0]);
-                       //DEBUG_TRACE("------------>dir_name is %s", dir_name);
                        char *semi_path = NULL;
                        semi_path = g_strjoinv("/", dir_levels + 1);
-                       //DEBUG_TRACE("------------>semi_path is %s", semi_path);
                        /*create folder in destination*/
                        /*1. check if duplicated Directory exists*/
                        char *unique_filename = NULL;
@@ -1439,14 +1429,11 @@ _move_folder(mp_media_info_h item_handle)
                } else { /*2. other folder*/
                        char *related_path = NULL;
                        _mp_edit_cb_get_logical_path_by_full(path, &related_path);
-                       //DEBUG_TRACE("------------>related_path is %s", related_path);
 
                        char **dir_levels = g_strsplit(related_path + 1, "/", 0);
                        char *dir_name = g_strdup(dir_levels[0]);
-                       //DEBUG_TRACE("------------>dir_name is %s", dir_name);
                        char *semi_path = NULL;
                        semi_path = g_strjoinv("/", dir_levels + 1);
-                       //DEBUG_TRACE("------------>semi_path is %s", semi_path);
                        /*create folder in destination*/
                        /*1. check if duplicated Directory exists*/
                        char *unique_filename = NULL;
@@ -1551,8 +1538,6 @@ _mp_edit_cb_move_thread(void *data, Ecore_Thread *thread)
        mp_list_item_data_t *item = NULL;
        mp_media_info_h item_handle = NULL;
 
-       //DEBUG_TRACE("g_list_type: %d, track_type: %d, g_group_type: %d", g_list_type, g_track_type, g_group_type);
-
        mp_media_info_connect();
 
        GList *node = g_list_last(g_selected_list);
@@ -1619,9 +1604,7 @@ _mp_edit_cb_move_thread(void *data, Ecore_Thread *thread)
                                dest_path = g_strconcat(MP_PERSONAL_PAGE_DIR, related_path, NULL);
                                MP_CHECK(dest_path);
                        }
-                       //DEBUG_TRACE("dest path is %s", dest_path);
                        char *dest_dir = mp_file_dir_get(dest_path);
-                       //DEBUG_TRACE("dest dir is %s", dest_dir);
 
                        /*for exception handle, if dest_dir is NULL, in _move_track_spec_path, it will use root path as dest*/
                        if (_move_track_spec_path(item_handle, dest_dir)) {
@@ -1756,8 +1739,6 @@ mp_edit_cb_excute_move(void *data)
        g_selected_count = g_list_length(g_selected_list);
        g_error_count = 0;
        g_edit_operation = MP_EDIT_MOVE;
-       //g_track_type = mp_list_get_track_type((MpList_t *)list);
-       //g_playlist_handle = mp_list_get_playlist_handle((MpList_t *)list);
 
        DEBUG_TRACE("g_list_type is %d", g_list_type);
        char *title = NULL;
@@ -1950,11 +1931,9 @@ mp_edit_create_delete_popup(void *data)
        mp_track_type_e type = mp_list_get_track_type(list);
        WARN_TRACE("track_type is %d", type);
        if (type > MP_TRACK_TYPE_PLAYLIST_MIN && type < MP_TRACK_TYPE_PLAYLIST_MAX) {
-               //elm_object_text_set(popup, GET_STR("IDS_MUSIC_POP_REMOVE_Q"));
                btn_txt = STR_MP_REMOVE;
                title = STR_MP_REMOVE;
        } else {
-               //elm_object_text_set(popup, GET_SYS_STR("IDS_COM_POP_DELETE_Q"));
                btn_txt = STR_MP_DELETE;
                title = STR_MP_DELETE;
        }
@@ -2031,6 +2010,5 @@ mp_edit_create_delete_popup(void *data)
        mp_popup_button_set(popup, MP_POPUP_BTN_2, btn_txt, MP_POPUP_YES);
 
        evas_object_show(popup);
-
 }
 
index 559661e..6f4cf18 100644 (file)
@@ -649,7 +649,6 @@ int mp_media_info_disconnect(void)
 /*filter*/
 int mp_media_filter_create(mp_filter_h *filter)
 {
-       //startfunc;
        int res = media_filter_create(filter);
        if (res != MEDIA_CONTENT_ERROR_NONE) {
                ERROR_TRACE("Error code 0x%x", res);
@@ -658,7 +657,6 @@ int mp_media_filter_create(mp_filter_h *filter)
 }
 int mp_media_filter_destory(mp_filter_h filter)
 {
-       //startfunc;
        int res = media_filter_destroy(filter);
        if (res != MEDIA_CONTENT_ERROR_NONE) {
                ERROR_TRACE("Error code 0x%x", res);
@@ -667,7 +665,6 @@ int mp_media_filter_destory(mp_filter_h filter)
 }
 int mp_media_filter_set_offset(mp_filter_h filter, int offset, int count)
 {
-       //startfunc;
        int res = media_filter_set_offset(filter, offset, count);
        if (res != MEDIA_CONTENT_ERROR_NONE) {
                ERROR_TRACE("Error code 0x%x", res);
@@ -676,7 +673,6 @@ int mp_media_filter_set_offset(mp_filter_h filter, int offset, int count)
 }
 int mp_media_filter_set_order(mp_filter_h filter, bool descending, const char *order_keyword, mp_media_content_collation_e collation)
 {
-       //startfunc;
        int res = media_filter_set_order(filter, descending, order_keyword, (media_content_collation_e)collation);
        if (res != MEDIA_CONTENT_ERROR_NONE) {
                ERROR_TRACE("Error code 0x%x", res);
@@ -685,7 +681,6 @@ int mp_media_filter_set_order(mp_filter_h filter, bool descending, const char *o
 }
 int mp_media_filter_set_condition(mp_filter_h filter, const char *condition, mp_media_content_collation_e collation)
 {
-       //startfunc;
        int res = media_filter_set_condition(filter, condition, (media_content_collation_e)collation);
        if (res != MEDIA_CONTENT_ERROR_NONE) {
                ERROR_TRACE("Error code 0x%x", res);
@@ -696,7 +691,6 @@ int mp_media_filter_set_condition(mp_filter_h filter, const char *condition, mp_
 /*media infomation*/
 int mp_media_info_list_count_w_filter(mp_track_type_e track_type, const char * folder_id, int playlist_id, mp_filter_h filter, int *count)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
        if (track_type == MP_TRACK_BY_FOLDER) {
                res = media_folder_get_media_count_from_db(folder_id, filter, count);
@@ -724,7 +718,6 @@ int mp_media_info_list_count_w_filter(mp_track_type_e track_type, const char * f
 
 int mp_media_info_list_count(mp_track_type_e track_type, const char *type_string, const char *type_string2, const char *filter_string, int playlist_id, int *count)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
        filter_h filter = NULL;
 
@@ -735,13 +728,11 @@ int mp_media_info_list_count(mp_track_type_e track_type, const char *type_string
 
        res = mp_media_info_list_count_w_filter(track_type, type_string, playlist_id, filter, count);
        media_filter_destroy(filter);
-       //endfunc;
        return res;
 }
 
 int mp_media_info_list_create_w_filter(mp_track_type_e track_type, const char *folder_id, int playlist_id, mp_filter_h filter, mp_media_list_h *media_list)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
 
        MP_CHECK_VAL(media_list, -1);
@@ -779,7 +770,6 @@ int mp_media_info_list_create_w_filter(mp_track_type_e track_type, const char *f
 int mp_media_info_list_create(mp_media_list_h *out_list,
                               mp_track_type_e track_type, const char *type_string, const char *type_string2, const char *filter_string, int playlist_id, int offset, int count)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
        filter_h filter = NULL;
 
@@ -788,7 +778,6 @@ int mp_media_info_list_create(mp_media_list_h *out_list,
        MP_CHECK_VAL(res == MEDIA_CONTENT_ERROR_NONE, res);
 
        res = media_filter_set_offset(filter, offset, count);
-       //DEBUG_TRACE("offset: %d, count: %d", offset, count);
        __mp_media_info_set_filter(filter, track_type, type_string, type_string2, filter_string);
 
        res = mp_media_info_list_create_w_filter(track_type, type_string, playlist_id, filter, out_list);
@@ -800,7 +789,6 @@ int mp_media_info_list_create(mp_media_list_h *out_list,
 #ifdef MP_SOUND_PLAYER
 int mp_media_info_sorted_track_list_create(mp_media_list_h *out_list, char *sort_type)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
        filter_h filter = NULL;
 
@@ -835,7 +823,6 @@ int mp_media_info_sorted_track_list_create(mp_media_list_h *out_list, char *sort
 
 int mp_media_info_list_destroy(mp_media_list_h media_list)
 {
-       //startfunc;
        MP_CHECK_VAL(media_list, -1);
 
        if (media_list->list) {
@@ -862,7 +849,6 @@ int mp_media_infor_list_get_count(mp_media_list_h media_list)
 
 int mp_media_info_create(mp_media_info_h *media_info, const char *media_id)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
        *media_info = calloc(1, sizeof(struct mp_media_info_s));
        MP_CHECK_VAL(*media_info, -1);
@@ -893,7 +879,6 @@ int mp_media_info_create(mp_media_info_h *media_info, const char *media_id)
 
 int mp_media_info_create_by_path(mp_media_info_h *media_info, const char *file_path)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
        mp_filter_h filter = NULL;
        char sql[MAX_NAM_LEN] = {0,};
@@ -1523,43 +1508,8 @@ int mp_media_info_set_added_time(mp_media_info_h media, time_t time)
        return res;
 }
 
-/*int mp_media_info_set_cloud_thumbnail_path(mp_media_info_h media, const char *path)
-{
-       MP_CHECK_VAL(media, -1);
-       MP_CHECK_VAL(media->i.minfo, -1);
-
-       char *current_thumbnail = NULL;
-       mp_media_info_get_thumbnail_path(media, &current_thumbnail);
-       if (!g_strcmp0(path, current_thumbnail)) {
-               // already updated
-               return 0;
-       }
-
-       mp_storage_type_e storage = MP_STORAGE_INTERNAL_EX;
-       mp_media_info_get_storage_type(media, &storage);
-
-       if (storage != MP_STORAGE_CLOUD_EX && storage != MP_STORAGE_MUSICHUB_EX) {
-               WARN_TRACE("media is not cloud item [storage type = %d]", storage);
-               return -1;
-       }
-
-       IF_FREE(media->i.minfo->thumbnail_path);
-       media->i.minfo->thumbnail_path = g_strdup(path);
-
-       int res = MEDIA_CONTENT_ERROR_NONE;
-       char *media_id = NULL;
-       mp_media_info_get_media_id(media, &media_id);
-       res = media_cloud_info_update_thumbnail_path_to_db(media_id, path);
-       if (res != MEDIA_CONTENT_ERROR_NONE)
-               ERROR_TRACE("Error code 0x%x", res);
-
-       PRINT_STR(path);
-       return res;
-}*/
-
 int mp_media_info_group_list_count(mp_group_type_e group_type, const char *type_string, const char *filter_string, int *count)
 {
-       //startfunc;
        mp_filter_h filter = NULL;
        int res = MEDIA_CONTENT_ERROR_NONE;
 
@@ -1581,7 +1531,6 @@ int mp_media_info_group_list_count(mp_group_type_e group_type, const char *type_
 }
 int mp_media_info_group_list_count_w_filter(mp_group_type_e group_type, mp_filter_h filter, int *count)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
        MP_CHECK_VAL(filter, -1);
        switch (group_type) {
@@ -1810,8 +1759,6 @@ static inline bool _artist_track_foreach_cb(media_info_h media, void *user_data)
                return false;
        }
 
-       //DEBUG_TRACE("info: %s, artist: %s", album, artist);
-
        GList **list = user_data;
        if (!*list) {
                audio_meta_destroy(audio);
@@ -1860,7 +1807,6 @@ static inline bool _artist_track_foreach_cb(media_info_h media, void *user_data)
                        data->album_thumnails = realloc(data->album_thumnails, sizeof(char *) * (data->thumb_count + 1));
                        __mp_media_info_get_thumbnail_path(media, &(data->album_thumnails[data->thumb_count]));
                        data->thumb_count++;
-                       //DEBUG_TRACE("artist: %s, album: %s", artist, album);
                        IF_FREE(album);
                } else {
                        IF_FREE(album);
@@ -1920,8 +1866,6 @@ _mp_media_info_set_group_extra_info(mp_media_list_h media_list, mp_group_type_e
                media_filter_set_order(filter, MEDIA_CONTENT_ORDER_ASC, MEDIA_ALBUM, MEDIA_CONTENT_COLLATE_NOCASE);
                media_foreach_cb = _album_track_foreach_cb;
                break;
-               //case MP_GROUP_BY_ARTIST_ALBUM:
-               //break;
        case MP_GROUP_BY_ARTIST:
                media_filter_set_order(filter, MEDIA_CONTENT_ORDER_ASC, "MEDIA_ARTIST, MEDIA_ALBUM", MEDIA_CONTENT_COLLATE_NOCASE);
                media_foreach_cb = _artist_track_foreach_cb;
@@ -1932,12 +1876,6 @@ _mp_media_info_set_group_extra_info(mp_media_list_h media_list, mp_group_type_e
                media_filter_set_order(filter, MEDIA_CONTENT_ORDER_ASC, "folder_uuid", MEDIA_CONTENT_COLLATE_NOCASE);
                media_foreach_cb = _folder_track_foreach_cb;
                break;
-               //case MP_GROUP_BY_YEAR:
-               //      break;
-               //case MP_GROUP_BY_COMPOSER:
-               //      break;
-               //case MP_GROUP_BY_PLAYLIST:
-               //      break;
        default:
                WARN_TRACE("Unsupported type: %d", group_type);
                media_filter_destroy(filter);
@@ -1962,8 +1900,6 @@ _mp_media_info_set_group_extra_info(mp_media_list_h media_list, mp_group_type_e
                        } else {
                                ret = mp_media_info_group_get_sub_info(media, &info);
                        }
-                       //DEBUG_TRACE("find folder from glist: %s", folder);
-                       //DEBUG_TRACE("list count: %d", g_list_length(node));
                        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                                ERROR_TRACE("Get group info error");
                        }
@@ -1984,7 +1920,6 @@ _mp_media_info_set_group_extra_info(mp_media_list_h media_list, mp_group_type_e
                                        IF_FREE(data->album);
                                        free(data);
                                        list = g_list_delete_link(list, node);
-                                       //DEBUG_TRACE("Found data!! count: %d, thumb: %s", media->i.ginfo->track_count, media->i.ginfo->thumb_path);
                                        break;
                                }
                                node = g_list_next(node);
@@ -2020,14 +1955,12 @@ _mp_media_info_set_group_extra_info(mp_media_list_h media_list, mp_group_type_e
 static int
 _mp_media_info_set_extra_info(mp_media_list_h media_list, mp_group_type_e group_type, const char *type_string, const char *filter_string)
 {
-       //startfunc;
        _mp_media_info_set_group_extra_info(media_list, group_type, type_string, filter_string);
        return 0;
 }
 
 int mp_media_info_group_list_create(mp_media_list_h *media_list, mp_group_type_e group_type, const char *type_string, const char *filter_string, int offset, int count)
 {
-       //startfunc;
        mp_filter_h filter = NULL;
        int res = MEDIA_CONTENT_ERROR_NONE;
 
@@ -2080,7 +2013,6 @@ int mp_media_info_group_list_create(mp_media_list_h *media_list, mp_group_type_e
 
 int mp_media_info_group_list_create_w_filter(mp_filter_h filter, mp_group_type_e group_type, mp_media_list_h *media_list)
 {
-       //startfunc;
        MP_CHECK_VAL(media_list, -1);
 
        *media_list = calloc(1, sizeof(struct mp_media_list_s));
@@ -2130,7 +2062,6 @@ int mp_media_info_group_list_create_w_filter(mp_filter_h filter, mp_group_type_e
 
 int mp_media_info_group_list_destroy(mp_media_list_h media_list)
 {
-//     startfunc;
        MP_CHECK_VAL(media_list, -1);
        g_list_free_full(media_list->list, __mp_media_group_destory);
        IF_FREE(media_list->distinct_check);
@@ -2237,133 +2168,128 @@ int mp_media_info_group_get_thumbnail_path(mp_media_info_h media, char **path)
        char *folde_id = NULL;
        if (!media->i.ginfo->thumb_path) {
 
-               /*if (media->s.group_type == MP_GROUP_BY_ALBUM || media->s.group_type == MP_GROUP_BY_ARTIST_ALBUM)
-                       res = media_album_get_album_art(media->h.group, &media->i.ginfo->thumb_path);
-               else*/{
-                       filter_h filter;
-                       mp_media_list_h list = NULL;
-                       mp_media_info_h minfo = NULL;
-                       char *type_string = NULL;
-                       char cond[MAX_FILTER_LEN] = {0,};
-                       int count = 0;
-
-                       mp_media_info_group_get_main_info(media, &type_string);
-
-                       res = media_filter_create(&filter);
-                       if (res != MEDIA_CONTENT_ERROR_NONE) {
-                               mp_error("media_filter_create:error=%d", res);
-                               IF_FREE(folde_id);
-                               return res;
-                       }
+               filter_h filter;
+               mp_media_list_h list = NULL;
+               mp_media_info_h minfo = NULL;
+               char *type_string = NULL;
+               char cond[MAX_FILTER_LEN] = {0,};
+               int count = 0;
 
-                       strncat(cond, MP_MEDIA_TYPE, STRNCAT_LEN(cond));
-                       if (media->s.group_type == MP_GROUP_BY_PLAYLIST) {
-                               media_filter_set_order(filter, MEDIA_CONTENT_ORDER_ASC, PLAYLIST_MEMBER_ORDER, MEDIA_CONTENT_COLLATE_NOCASE);
-                       } else {
-                               media_filter_set_order(filter, MEDIA_CONTENT_ORDER_ASC, MEDIA_TITLE, MEDIA_CONTENT_COLLATE_NOCASE);
-                       }
+               mp_media_info_group_get_main_info(media, &type_string);
 
-                       if (media->s.group_type == MP_GROUP_BY_ALBUM || media->s.group_type == MP_GROUP_BY_ARTIST_ALBUM) {
-                               strncat(cond, " AND MEDIA_ALBUM='", STRNCAT_LEN(cond));
-                               _mp_media_info_sql_strncat(cond, type_string, STRNCAT_LEN(cond));
-                               strncat(cond, "' AND MEDIA_THUMBNAIL_PATH is not null", STRNCAT_LEN(cond));
-                               media_filter_set_condition(filter, cond, MEDIA_CONTENT_COLLATE_NOCASE);
+               res = media_filter_create(&filter);
+               if (res != MEDIA_CONTENT_ERROR_NONE) {
+                       mp_error("media_filter_create:error=%d", res);
+                       IF_FREE(folde_id);
+                       return res;
+               }
 
-                               mp_media_info_list_count_w_filter(MP_TRACK_ALL, NULL, 0, filter, &count);
-                               if (count > 0) {
-                                       media_filter_set_offset(filter, 0, 1);
-                                       mp_media_info_list_create_w_filter(MP_TRACK_ALL, NULL, 0, filter, &list);
-                               }
+               strncat(cond, MP_MEDIA_TYPE, STRNCAT_LEN(cond));
+               if (media->s.group_type == MP_GROUP_BY_PLAYLIST) {
+                       media_filter_set_order(filter, MEDIA_CONTENT_ORDER_ASC, PLAYLIST_MEMBER_ORDER, MEDIA_CONTENT_COLLATE_NOCASE);
+               } else {
+                       media_filter_set_order(filter, MEDIA_CONTENT_ORDER_ASC, MEDIA_TITLE, MEDIA_CONTENT_COLLATE_NOCASE);
+               }
 
-                       } else if (media->s.group_type == MP_GROUP_BY_ARTIST && type_string) {
-                               strncat(cond, " AND MEDIA_ARTIST='", STRNCAT_LEN(cond));
-                               _mp_media_info_sql_strncat(cond, type_string, STRNCAT_LEN(cond));
-                               strncat(cond, "' AND MEDIA_THUMBNAIL_PATH is not null", STRNCAT_LEN(cond));
-                               media_filter_set_condition(filter, cond, MEDIA_CONTENT_COLLATE_NOCASE);
+               if (media->s.group_type == MP_GROUP_BY_ALBUM || media->s.group_type == MP_GROUP_BY_ARTIST_ALBUM) {
+                       strncat(cond, " AND MEDIA_ALBUM='", STRNCAT_LEN(cond));
+                       _mp_media_info_sql_strncat(cond, type_string, STRNCAT_LEN(cond));
+                       strncat(cond, "' AND MEDIA_THUMBNAIL_PATH is not null", STRNCAT_LEN(cond));
+                       media_filter_set_condition(filter, cond, MEDIA_CONTENT_COLLATE_NOCASE);
 
-                               mp_media_info_list_count_w_filter(MP_TRACK_ALL, NULL, 0, filter, &count);
-                               if (count > 0) {
-                                       media_filter_set_offset(filter, 0, 1);
-                                       mp_media_info_list_create_w_filter(MP_TRACK_ALL, NULL, 0, filter, &list);
-                               }
+                       mp_media_info_list_count_w_filter(MP_TRACK_ALL, NULL, 0, filter, &count);
+                       if (count > 0) {
+                               media_filter_set_offset(filter, 0, 1);
+                               mp_media_info_list_create_w_filter(MP_TRACK_ALL, NULL, 0, filter, &list);
+                       }
 
-                       } else if (media->s.group_type == MP_GROUP_BY_GENRE && type_string) {
-                               strncat(cond, " AND MEDIA_GENRE='", STRNCAT_LEN(cond));
-                               _mp_media_info_sql_strncat(cond, type_string, STRNCAT_LEN(cond));
-                               strncat(cond, "' AND MEDIA_THUMBNAIL_PATH is not NULL", STRNCAT_LEN(cond));
-                               media_filter_set_condition(filter, cond, MEDIA_CONTENT_COLLATE_NOCASE);
+               } else if (media->s.group_type == MP_GROUP_BY_ARTIST && type_string) {
+                       strncat(cond, " AND MEDIA_ARTIST='", STRNCAT_LEN(cond));
+                       _mp_media_info_sql_strncat(cond, type_string, STRNCAT_LEN(cond));
+                       strncat(cond, "' AND MEDIA_THUMBNAIL_PATH is not null", STRNCAT_LEN(cond));
+                       media_filter_set_condition(filter, cond, MEDIA_CONTENT_COLLATE_NOCASE);
 
-                               mp_media_info_list_count_w_filter(MP_TRACK_ALL, NULL, 0, filter, &count);
-                               if (count > 0) {
-                                       media_filter_set_offset(filter, 0, 1);
-                                       mp_media_info_list_create_w_filter(MP_TRACK_ALL, NULL, 0, filter, &list);
-                               }
-                       } else if (media->s.group_type == MP_GROUP_BY_FOLDER) {
-                               mp_media_info_group_get_folder_id(media, &folde_id);
+                       mp_media_info_list_count_w_filter(MP_TRACK_ALL, NULL, 0, filter, &count);
+                       if (count > 0) {
+                               media_filter_set_offset(filter, 0, 1);
+                               mp_media_info_list_create_w_filter(MP_TRACK_ALL, NULL, 0, filter, &list);
+                       }
 
-                               strncat(cond, " AND MEDIA_THUMBNAIL_PATH is not NULL", STRNCAT_LEN(cond));
+               } else if (media->s.group_type == MP_GROUP_BY_GENRE && type_string) {
+                       strncat(cond, " AND MEDIA_GENRE='", STRNCAT_LEN(cond));
+                       _mp_media_info_sql_strncat(cond, type_string, STRNCAT_LEN(cond));
+                       strncat(cond, "' AND MEDIA_THUMBNAIL_PATH is not NULL", STRNCAT_LEN(cond));
+                       media_filter_set_condition(filter, cond, MEDIA_CONTENT_COLLATE_NOCASE);
 
-                               media_filter_set_condition(filter, cond, MEDIA_CONTENT_COLLATE_NOCASE);
-                               mp_media_info_list_count_w_filter(MP_TRACK_BY_FOLDER, folde_id, 0, filter, &count);
-                               if (count > 0) {
-                                       media_filter_set_offset(filter, 0, 1);
-                                       mp_media_info_list_create_w_filter(MP_TRACK_BY_FOLDER, folde_id, 0, filter, &list);
-                               }
-                       } else if (media->s.group_type == MP_GROUP_BY_YEAR && type_string) {
-                               strncat(cond, " AND MEDIA_YEAR='", STRNCAT_LEN(cond));
-                               _mp_media_info_sql_strncat(cond, type_string, STRNCAT_LEN(cond));
-                               strncat(cond, "' AND MEDIA_THUMBNAIL_PATH is not NULL", STRNCAT_LEN(cond));
-                               media_filter_set_condition(filter, cond, MEDIA_CONTENT_COLLATE_NOCASE);
-
-                               mp_media_info_list_count_w_filter(MP_TRACK_ALL, NULL, 0, filter, &count);
-                               if (count > 0) {
-                                       media_filter_set_offset(filter, 0, 1);
-                                       mp_media_info_list_create_w_filter(MP_TRACK_ALL, NULL, 0, filter, &list);
-                               }
-                       } else if (media->s.group_type == MP_GROUP_BY_COMPOSER && type_string) {
-                               strncat(cond, " AND MEDIA_COMPOSER='", STRNCAT_LEN(cond));
-                               _mp_media_info_sql_strncat(cond, type_string, STRNCAT_LEN(cond));
-                               strncat(cond, "' AND MEDIA_THUMBNAIL_PATH is not NULL", STRNCAT_LEN(cond));
-                               media_filter_set_condition(filter, cond, MEDIA_CONTENT_COLLATE_NOCASE);
-
-                               mp_media_info_list_count_w_filter(MP_TRACK_ALL, NULL, 0, filter, &count);
-                               if (count > 0) {
-                                       media_filter_set_offset(filter, 0, 1);
-                                       mp_media_info_list_create_w_filter(MP_TRACK_ALL, NULL, 0, filter, &list);
-                               }
-                       } else if (media->s.group_type == MP_GROUP_BY_PLAYLIST) {
-                               int playlist_id = 0;
-                               mp_media_info_group_get_playlist_id(media, &playlist_id);
+                       mp_media_info_list_count_w_filter(MP_TRACK_ALL, NULL, 0, filter, &count);
+                       if (count > 0) {
+                               media_filter_set_offset(filter, 0, 1);
+                               mp_media_info_list_create_w_filter(MP_TRACK_ALL, NULL, 0, filter, &list);
+                       }
+               } else if (media->s.group_type == MP_GROUP_BY_FOLDER) {
+                       mp_media_info_group_get_folder_id(media, &folde_id);
 
-                               strncat(cond, " AND MEDIA_THUMBNAIL_PATH is not NULL", STRNCAT_LEN(cond));
+                       strncat(cond, " AND MEDIA_THUMBNAIL_PATH is not NULL", STRNCAT_LEN(cond));
 
-                               media_filter_set_condition(filter, cond, MEDIA_CONTENT_COLLATE_NOCASE);
-                               mp_media_info_list_count_w_filter(MP_TRACK_BY_PLAYLIST, NULL, playlist_id, filter, &count);
-                               if (count > 0) {
-                                       media_filter_set_offset(filter, 0, 1);
-                                       mp_media_info_list_create_w_filter(MP_TRACK_BY_PLAYLIST, NULL, playlist_id, filter, &list);
-                               }
-                       } else {
-                               WARN_TRACE("Unhandled type: %d", media->s.group_type);
-                               media_filter_destroy(filter);
-                               goto END;
+                       media_filter_set_condition(filter, cond, MEDIA_CONTENT_COLLATE_NOCASE);
+                       mp_media_info_list_count_w_filter(MP_TRACK_BY_FOLDER, folde_id, 0, filter, &count);
+                       if (count > 0) {
+                               media_filter_set_offset(filter, 0, 1);
+                               mp_media_info_list_create_w_filter(MP_TRACK_BY_FOLDER, folde_id, 0, filter, &list);
                        }
-                       WARN_TRACE("count: %d", count);
-
-                       if (list) {
-                               char *thumb_path = NULL;
-                               minfo = mp_media_info_list_nth_item(list, 0);
-                               if (!minfo) {
-                                       media_filter_destroy(filter);
-                                       return -1;
-                               }
-                               mp_media_info_get_thumbnail_path(minfo, &thumb_path);
-                               media->i.ginfo->thumb_path = g_strdup(thumb_path);
-                               mp_media_info_list_destroy(list);
+               } else if (media->s.group_type == MP_GROUP_BY_YEAR && type_string) {
+                       strncat(cond, " AND MEDIA_YEAR='", STRNCAT_LEN(cond));
+                       _mp_media_info_sql_strncat(cond, type_string, STRNCAT_LEN(cond));
+                       strncat(cond, "' AND MEDIA_THUMBNAIL_PATH is not NULL", STRNCAT_LEN(cond));
+                       media_filter_set_condition(filter, cond, MEDIA_CONTENT_COLLATE_NOCASE);
+
+                       mp_media_info_list_count_w_filter(MP_TRACK_ALL, NULL, 0, filter, &count);
+                       if (count > 0) {
+                               media_filter_set_offset(filter, 0, 1);
+                               mp_media_info_list_create_w_filter(MP_TRACK_ALL, NULL, 0, filter, &list);
+                       }
+               } else if (media->s.group_type == MP_GROUP_BY_COMPOSER && type_string) {
+                       strncat(cond, " AND MEDIA_COMPOSER='", STRNCAT_LEN(cond));
+                       _mp_media_info_sql_strncat(cond, type_string, STRNCAT_LEN(cond));
+                       strncat(cond, "' AND MEDIA_THUMBNAIL_PATH is not NULL", STRNCAT_LEN(cond));
+                       media_filter_set_condition(filter, cond, MEDIA_CONTENT_COLLATE_NOCASE);
+
+                       mp_media_info_list_count_w_filter(MP_TRACK_ALL, NULL, 0, filter, &count);
+                       if (count > 0) {
+                               media_filter_set_offset(filter, 0, 1);
+                               mp_media_info_list_create_w_filter(MP_TRACK_ALL, NULL, 0, filter, &list);
                        }
+               } else if (media->s.group_type == MP_GROUP_BY_PLAYLIST) {
+                       int playlist_id = 0;
+                       mp_media_info_group_get_playlist_id(media, &playlist_id);
+
+                       strncat(cond, " AND MEDIA_THUMBNAIL_PATH is not NULL", STRNCAT_LEN(cond));
+
+                       media_filter_set_condition(filter, cond, MEDIA_CONTENT_COLLATE_NOCASE);
+                       mp_media_info_list_count_w_filter(MP_TRACK_BY_PLAYLIST, NULL, playlist_id, filter, &count);
+                       if (count > 0) {
+                               media_filter_set_offset(filter, 0, 1);
+                               mp_media_info_list_create_w_filter(MP_TRACK_BY_PLAYLIST, NULL, playlist_id, filter, &list);
+                       }
+               } else {
+                       WARN_TRACE("Unhandled type: %d", media->s.group_type);
                        media_filter_destroy(filter);
+                       goto END;
                }
+               WARN_TRACE("count: %d", count);
 
+               if (list) {
+                       char *thumb_path = NULL;
+                       minfo = mp_media_info_list_nth_item(list, 0);
+                       if (!minfo) {
+                               media_filter_destroy(filter);
+                               return -1;
+                       }
+                       mp_media_info_get_thumbnail_path(minfo, &thumb_path);
+                       media->i.ginfo->thumb_path = g_strdup(thumb_path);
+                       mp_media_info_list_destroy(list);
+               }
+               media_filter_destroy(filter);
        }
 END:
        IF_FREE(folde_id);
@@ -2410,7 +2336,6 @@ int mp_media_info_playlist_get_thumbnail_path(mp_media_info_h media, char **path
 int mp_media_info_playlist_set_thumbnail_path(mp_media_info_h media, const char *path)
 {
        /*currently, it only works for playlist thumbnail update*/
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
 
        MP_CHECK_VAL(path, -1);
@@ -2432,7 +2357,6 @@ int mp_media_info_playlist_set_thumbnail_path(mp_media_info_h media, const char
 
 int mp_media_info_playlist_get_id_by_name(const char *playlist_name, int *playlist_id)
 {
-       //startfunc;
        mp_filter_h filter = NULL;
        mp_media_list_h list;
        mp_media_info_h media;
@@ -2480,7 +2404,6 @@ int mp_media_info_playlist_get_id_by_name(const char *playlist_name, int *playli
 
 int mp_media_info_playlist_delete_from_db(int playlist_id)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
        res = media_playlist_delete_from_db(playlist_id);
        return res;
@@ -2497,7 +2420,6 @@ int mp_media_info_playlist_handle_create(mp_playlist_h *playlist_h, int playlist
 
 int mp_media_info_playlist_add_media(int playlist_id, const char *media_id)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
        media_playlist_h playlist = NULL;
 
@@ -2526,7 +2448,6 @@ int mp_media_info_playlist_add_media(int playlist_id, const char *media_id)
 
 int mp_media_info_playlist_remove_media(mp_media_info_h playlist, int memeber_id)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
 
        MP_CHECK_VAL(playlist, -1);
@@ -2540,7 +2461,6 @@ int mp_media_info_playlist_remove_media(mp_media_info_h playlist, int memeber_id
 
 int mp_media_info_playlist_is_exist(const char *playlist_name, bool *exist)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
        filter_h filter = NULL;
        char cond[MAX_FILTER_LEN] = {0,};
@@ -2563,7 +2483,6 @@ int mp_media_info_playlist_is_exist(const char *playlist_name, bool *exist)
 
 int mp_media_info_playlist_unique_name(const char *orig_name, char *unique_name, size_t max_unique_name_length)
 {
-       //startfunc;
        bool exist = false;
        int i = 1;
 
@@ -2589,7 +2508,6 @@ int mp_media_info_playlist_unique_name(const char *orig_name, char *unique_name,
 
 int mp_media_info_playlist_rename(mp_media_info_h playlist, const char *new_name)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
 
        MP_CHECK_VAL(playlist, -1);
@@ -2612,7 +2530,6 @@ int mp_media_info_playlist_rename(mp_media_info_h playlist, const char *new_name
 
 int mp_media_info_playlist_db_update(mp_playlist_h playlist_handle)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
 
        MP_CHECK_VAL(playlist_handle, -1);
@@ -2625,7 +2542,6 @@ int mp_media_info_playlist_db_update(mp_playlist_h playlist_handle)
 
 int mp_media_info_playlist_get_play_order(mp_media_info_h playlist, int playlist_member_id, int * play_order)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
 
        MP_CHECK_VAL(playlist, -1);
@@ -2640,7 +2556,6 @@ int mp_media_info_playlist_get_play_order(mp_media_info_h playlist, int playlist
 
 int mp_media_info_playlist_set_play_order(mp_media_info_h playlist, int playlist_member_id, int play_order)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
 
        MP_CHECK_VAL(playlist, -1);
@@ -2655,7 +2570,6 @@ int mp_media_info_playlist_set_play_order(mp_media_info_h playlist, int playlist
 
 int mp_media_info_playlist_update_db(mp_media_info_h playlist)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
 
        MP_CHECK_VAL(playlist, -1);
@@ -2671,7 +2585,6 @@ int mp_media_info_playlist_update_db(mp_media_info_h playlist)
 int
 mp_media_info_delete_from_db(const char *path)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
        res = media_content_scan_file(path);
        MP_CHECK_VAL(res == MEDIA_CONTENT_ERROR_NONE, res);
@@ -2704,7 +2617,6 @@ int mp_media_info_dup_playlist_handle_from_list_item(mp_media_info_h playlist, m
 
 int mp_media_info_playlist_insert_to_db(const char * name, int *playlist_id, mp_playlist_h *playlist_handle)
 {
-       //startfunc;
        int res = MEDIA_CONTENT_ERROR_NONE;
        media_playlist_h playlist = NULL;
 
@@ -2723,7 +2635,6 @@ int mp_media_info_playlist_insert_to_db(const char * name, int *playlist_id, mp_
 
 int mp_media_info_playlist_get_name_by_id(int playlist_id, char **playlist_name)
 {
-       //startfunc;
        mp_filter_h filter = NULL;
        mp_media_list_h list;
        mp_media_info_h media = NULL;
index f90b414..1b7c036 100644 (file)
@@ -128,15 +128,6 @@ static const char *kor_sec[] = {
        "\xe3\x85\xa3",
 };
 
-static unsigned char mask_len[] = {
-       0x80, /* 1000 0000 */ 0x00,     /* 0xxx xxxx */
-       0xE0, /* 1110 0000 */ 0xC0,     /* 110x xxxx */
-       0xF0, /* 1111 0000 */ 0xE0,     /* 1110 xxxx */
-       0xF8, /* 1111 1000 */ 0xF0,     /* 1111 0xxx */
-       0xFC, /* 1111 1100 */ 0xF8,     /* 1111 10xx */
-       0xFE, /* 1111 1110 */ 0xFC,     /* 1111 110x */
-};
-
 extern struct appdata *g_ad;
 
 EXPORT_API struct appdata *mp_util_get_appdata(void) {
@@ -377,7 +368,6 @@ mp_util_create_image(Evas_Object * obj, const char *path, const char *group, int
 Evas_Object *
 mp_util_create_thumb_icon(Evas_Object * obj, const char *path, int w, int h)
 {
-       //startfunc;
        Evas_Object *thumbnail = elm_image_add(obj);
        if (w == h) {
                elm_image_prescale_set(thumbnail, w);
@@ -1755,43 +1745,6 @@ void mp_util_print_geometry(Evas_Object *obj, const char *name)
        evas_object_data_set(obj, "obj_name", name);
 }
 
-static inline void _mp_util_launch_unlock_password()
-{
-       eventfunc;
-
-       app_control_h service = NULL;
-       int ret = APP_CONTROL_ERROR_NONE;
-
-       ret = app_control_create(&service);
-       if (ret != APP_CONTROL_ERROR_NONE) {
-               mp_error("app_control_create() .. [0x%x]", ret);
-               return;
-       }
-
-       ret = app_control_set_operation(service, APP_CONTROL_OPERATION_DEFAULT);
-       if (ret != APP_CONTROL_ERROR_NONE) {
-               mp_error("app_control_set_operation() .. [0x%x]", ret);
-               app_control_destroy(service);
-               return;
-       }
-
-       ret = app_control_add_extra_data(service, "lock_type", "go_to_password");
-       if (ret != APP_CONTROL_ERROR_NONE) {
-               mp_error("app_control_add_extra_data() .. [0x%x]", ret);
-               app_control_destroy(service);
-               return;
-       }
-
-       ret = app_control_send_launch_request(service, NULL, NULL);
-       if (ret != APP_CONTROL_ERROR_NONE) {
-               mp_error("app_control_send_launch_request() .. [0x%x]", ret);
-               app_control_destroy(service);
-               return;
-       }
-
-       app_control_destroy(service);
-}
-
 void mp_util_lock_cpu()
 {
        int ret = device_power_request_lock(POWER_LOCK_CPU, 0);
@@ -2427,8 +2380,6 @@ mp_dir_e mp_util_get_file_location(const char *uri)
                DEBUG_TRACE("External Storage Path is: %s", externalPath);
        }
 
-       len_http = strlen(MP_HTTP_DIR);
-
        if (strncmp(uri, internalPath, len_phone) == 0) {
                IF_FREE(internalPath);
                IF_FREE(externalPath);
@@ -2437,10 +2388,6 @@ mp_dir_e mp_util_get_file_location(const char *uri)
                IF_FREE(internalPath);
                IF_FREE(externalPath);
                return MP_DIR_MMC;
-       } else if (strncmp(uri, MP_HTTP_DIR, len_http) == 0) {
-               IF_FREE(internalPath);
-               IF_FREE(externalPath);
-               return MP_DIR_HTTP;
        } else {
                IF_FREE(internalPath);
                IF_FREE(externalPath);
index 7625815..19f5944 100644 (file)
@@ -37,15 +37,6 @@ typedef enum _mp_plst_repeat_state
        MP_PLST_REPEAT_ONE,
 }mp_plst_repeat_state;
 
-#ifdef MP_FEATURE_PLST_QUEUE
-typedef enum{
-       MP_PLAYLIST_QUEUE_ADDED,
-       MP_PLSYLIST_QUEUE_REMOVED,
-       MP_PLSYLIST_QUEUE_MOVED,
-}mp_playlist_queue_cmd_type;
-typedef void (*mp_queue_item_removed_cb)(mp_playlist_queue_cmd_type cmd_type, int index,void *userdata);
-#endif
-
 typedef struct
 {
        FILE *fp;
@@ -59,9 +50,6 @@ typedef struct
 typedef struct _mp_list_item
 {
        mp_track_type track_type;
-#ifdef MP_FEATURE_PLST_QUEUE
-       Eina_Bool is_queue;
-#endif
        char *uri;              //local track uri..
        char *uid;      //unique id (media_id or allshare item id)
        char *title;
@@ -82,12 +70,6 @@ typedef struct _mp_plst_mgr
        GList *list;            //normal list do not free, just refer normal_list or shuffle_list
        GList *normal_list;
        GList *shuffle_list;
-#ifdef MP_FEATURE_PLST_QUEUE
-       GList *queue_list;
-
-       void *userdata;
-       void(*queue_item_cb)(mp_playlist_queue_cmd_type cmd_type, int index,void *userdata);
-#endif
        void *item_change_userdata;
        mp_playlist_item_change_callback item_change_cb;
 
@@ -107,10 +89,6 @@ void mp_playlist_mgr_destroy(mp_plst_mgr *playlist_mgr);
 mp_plst_item * mp_playlist_mgr_item_append(mp_plst_mgr *playlist_mgr, const char *uri, const char *uid, const char *title, const char *artist, mp_track_type type);
 mp_plst_item * mp_playlist_mgr_item_insert(mp_plst_mgr *playlist_mgr, const char *uri, const char *uid, const char *title, const char *artist, mp_track_type type, int index);
 void mp_playlist_mgr_item_set_playlist_memeber_id(mp_plst_item *item, int memeber_id);
-#ifdef MP_FEATURE_PLST_QUEUE
-mp_plst_item * mp_playlist_mgr_item_queue(mp_plst_mgr *playlist_mgr, const char *uri, const char *uid, mp_track_type type);
-#endif
-
 void mp_playlist_mgr_item_remove_item(mp_plst_mgr *playlist_mgr, mp_plst_item *item);
 void mp_playlist_mgr_item_remove_nth(mp_plst_mgr *playlist_mgr, int index);
 void mp_playlist_mgr_clear(mp_plst_mgr *playlist_mgr);
@@ -133,9 +111,6 @@ bool mp_playlist_mgr_get_shuffle(mp_plst_mgr *playlist_mgr);
 Eina_Bool mp_playlist_mgr_is_shuffle(mp_plst_mgr *playlist_mgr);
 void mp_playlist_mgr_set_repeat(mp_plst_mgr *playlist_mgr, mp_plst_repeat_state repeat);
 int mp_playlist_mgr_get_repeat(mp_plst_mgr *playlist_mgr);
-#ifdef MP_FEATURE_PLST_QUEUE
-Eina_Bool mp_playlist_mgr_set_queue_cb(mp_plst_mgr* playlist_mgr, mp_queue_item_removed_cb queue_item_removed, void *userdata);
-#endif
 int mp_playlist_mgr_set_item_change_callback(mp_plst_mgr *playlist_mgr, mp_playlist_item_change_callback cb, void *userdata);
 
 void mp_playlist_mgr_set_list_type(mp_plst_mgr *playlist_mgr, mp_plst_type type);
index b6e0353..a382168 100644 (file)
@@ -34,12 +34,6 @@ void __mp_playlist_mgr_item_free(void *data)
 {
        mp_plst_item *node = (mp_plst_item *)data;
        MP_CHECK(node);
-#ifdef MP_FEATURE_PLST_QUEUE
-       if (node->is_queue) {
-               DEBUG_TRACE("queued item will be remained");
-               return;
-       }
-#endif
        IF_FREE(node->uri);
        IF_FREE(node->uid);
        IF_FREE(node->title);
@@ -186,18 +180,7 @@ static inline void _mp_playlist_mgr_item_append_common(mp_plst_mgr *playlist_mgr
        }
 
        /*insert to shuffle list*/
-#ifdef MP_FEATURE_PLST_QUEUE
-       int queue_lenth;
-       queue_lenth = g_list_length(playlist_mgr->queue_list);
-       pos = __mp_playlist_mgr_rand_position(g_list_length(playlist_mgr->normal_list), queue_lenth);
-
-       int queue_start = g_list_index(playlist_mgr->shuffle_list, g_list_nth_data(playlist_mgr->queue_list, 0));
-       if (pos >= queue_start - 1) {
-               pos += queue_lenth;
-       }
-#else
        pos = __mp_playlist_mgr_rand_position(g_list_length(playlist_mgr->normal_list), 0);
-#endif
 
        if (playlist_mgr->shuffle_state) {
                cur = mp_playlist_mgr_get_current(playlist_mgr);
@@ -236,15 +219,6 @@ static mp_plst_item *_mp_playlist_mgr_create_node(const char *uri, const char *u
        return node;
 }
 
-#ifdef __PRINT_PLAYLIST_ITEMS__
-static void
-__playlist_print_list(void *data, void *user_data)
-{
-       mp_plst_item *cur = data;
-       WARN_TRACE("%s", cur->uri);
-}
-#endif
-
 mp_plst_item *mp_playlist_mgr_item_append(mp_plst_mgr *playlist_mgr, const char *uri, const char *uid, const char *title, const char *artist, mp_track_type type)
 {
        MP_CHECK_VAL(playlist_mgr, NULL);
@@ -254,15 +228,6 @@ mp_plst_item *mp_playlist_mgr_item_append(mp_plst_mgr *playlist_mgr, const char
 
        _mp_playlist_mgr_item_append_common(playlist_mgr, node, -1);
 
-#ifdef __PRINT_PLAYLIST_ITEMS__
-       DEBUG_TRACE("list");
-       g_list_foreach(playlist_mgr->list, __playlist_print_list, playlist_mgr->list);
-       DEBUG_TRACE("normal list");
-       g_list_foreach(playlist_mgr->normal_list, __playlist_print_list, playlist_mgr->normal_list);
-       DEBUG_TRACE("shuffle list");
-       g_list_foreach(playlist_mgr->shuffle_list, __playlist_print_list, playlist_mgr->shuffle_list);
-#endif
-
        return node;
 }
 
@@ -285,148 +250,6 @@ void mp_playlist_mgr_item_set_playlist_memeber_id(mp_plst_item *item, int memebe
        item->playlist_memeber_id = memeber_id;
 }
 
-#ifdef MP_FEATURE_PLST_QUEUE
-static GList *__mp_playlist_mgr_delete_queue_link(GList *list)
-{
-       startfunc;
-       mp_plst_item *item;
-       GList *new_list, *remove;
-       int idx = 0;
-
-       new_list = list;
-       remove = g_list_nth(new_list, idx);
-       MP_CHECK_NULL(remove);
-
-       while (remove) {
-               item = remove->data;
-
-               if (item->is_queue) {
-                       DEBUG_TRACE("delete : %s", item->uid);
-                       new_list = g_list_remove_link(new_list, remove);
-                       g_list_free(remove);
-               } else {
-                       idx++;
-               }
-
-               remove = g_list_nth(new_list, idx);
-       }
-
-       return new_list;
-}
-
-static void __mp_playlist_mgr_index(mp_plst_mgr *playlist_mgr, int *pos, int *shuffle_pos)
-{
-       MP_CHECK(playlist_mgr);
-       int idx, s_idx;
-       if (playlist_mgr->shuffle_state) {
-               s_idx = playlist_mgr->current_index;
-               idx = g_list_index(playlist_mgr->normal_list, g_list_nth_data(playlist_mgr->shuffle_list, s_idx));
-       } else {
-               idx = playlist_mgr->current_index;
-               s_idx = g_list_index(playlist_mgr->shuffle_list, g_list_nth_data(playlist_mgr->normal_list, idx));
-       }
-
-       *pos = idx;
-       *shuffle_pos = s_idx;
-}
-
-static void __mp_playlist_mgr_clear_queue(mp_plst_mgr *playlist_mgr)
-{
-       startfunc;
-       int idx, s_idx;
-
-       MP_CHECK(playlist_mgr);
-
-       __mp_playlist_mgr_index(playlist_mgr, &idx, &s_idx);
-       DEBUG_TRACE("idx: %d, s_idx: %d", idx, s_idx);
-
-       playlist_mgr->normal_list = __mp_playlist_mgr_delete_queue_link(playlist_mgr->normal_list);
-       playlist_mgr->shuffle_list = __mp_playlist_mgr_delete_queue_link(playlist_mgr->shuffle_list);
-
-       __mp_playlist_mgr_select_list(playlist_mgr);
-
-       endfunc;
-}
-
-static void
-__mp_playlist_mgr_insert_queue_links(mp_plst_mgr *playlist_mgr)
-{
-       GList *list;
-       int idx, s_idx;
-
-       MP_CHECK(playlist_mgr);
-
-       __mp_playlist_mgr_index(playlist_mgr, &idx, &s_idx);
-
-       list = g_list_last(playlist_mgr->queue_list);
-       MP_CHECK(list);
-
-       idx++;
-       s_idx++;
-
-       do {
-               playlist_mgr->normal_list = g_list_insert(playlist_mgr->normal_list, list->data, idx);
-               playlist_mgr->shuffle_list = g_list_insert(playlist_mgr->shuffle_list, list->data, s_idx);
-               list = g_list_previous(list);
-       } while (list);
-
-       if (playlist_mgr->queue_item_cb) {
-               playlist_mgr->queue_item_cb(MP_PLSYLIST_QUEUE_MOVED, playlist_mgr->shuffle_state ? s_idx : idx, playlist_mgr->userdata);
-       }
-}
-
-mp_plst_item *mp_playlist_mgr_item_queue(mp_plst_mgr *playlist_mgr, const char *uri, const char *uid, mp_track_type type)
-{
-       DEBUG_TRACE("uri: %s, uid:%s", uri, uid);
-       MP_CHECK_VAL(playlist_mgr, NULL);
-
-       mp_plst_item *p_data = NULL;
-       GList *last;
-       int pos, s_pos;
-
-       if (playlist_mgr->queue_list) {
-               last = g_list_last(playlist_mgr->queue_list);
-               if (last) {
-                       p_data = last->data;
-               }
-       }
-       /*create data*/
-       mp_plst_item *node = calloc(1, sizeof(mp_plst_item));
-       MP_CHECK_VAL(node, NULL);
-
-       if (uri) {
-               node->track_type = EINA_TRUE;
-               node->uri = g_strdup(uri);
-       }
-       node->uid = g_strdup(uid);
-       node->is_queue = EINA_TRUE;
-
-       /*append item*/
-       playlist_mgr->queue_list = g_list_append(playlist_mgr->queue_list, node);
-
-       /*insert queue items to list*/
-       if (p_data) {
-               pos = g_list_index(playlist_mgr->normal_list, p_data) + 1;
-               s_pos = g_list_index(playlist_mgr->shuffle_list, p_data) + 1;
-       } else {
-               __mp_playlist_mgr_index(playlist_mgr, &pos, &s_pos);
-               pos++;
-               s_pos++;
-       }
-       playlist_mgr->normal_list = g_list_insert(playlist_mgr->normal_list, node, pos);
-       playlist_mgr->shuffle_list = g_list_insert(playlist_mgr->shuffle_list, node, s_pos);
-
-       /*select list */
-       __mp_playlist_mgr_select_list(playlist_mgr);
-
-       if (playlist_mgr->queue_item_cb) {
-               playlist_mgr->queue_item_cb(MP_PLAYLIST_QUEUE_ADDED, playlist_mgr->shuffle_state ? s_pos : pos, playlist_mgr->userdata);
-       }
-
-       return node;
-}
-#endif
-
 void mp_playlist_mgr_item_remove_item(mp_plst_mgr *playlist_mgr, mp_plst_item *item)
 {
        startfunc;
@@ -449,23 +272,9 @@ void mp_playlist_mgr_item_remove_item(mp_plst_mgr *playlist_mgr, mp_plst_item *i
        /*remove from normal_list*/
        remove = g_list_find(playlist_mgr->normal_list, item);
        MP_CHECK(remove);
-#ifdef MP_FEATURE_PLST_QUEUE
-       item->is_queue = EINA_FALSE;
-#endif
        playlist_mgr->normal_list = g_list_remove_link(playlist_mgr->normal_list, remove);
        g_list_free_full(remove, __mp_playlist_mgr_item_free);
 
-#ifdef MP_FEATURE_PLST_QUEUE
-       /*remove from queue list*/
-       if (playlist_mgr->queue_list) {
-               remove = g_list_find(playlist_mgr->queue_list, item);
-               if (remove) {
-                       playlist_mgr->queue_list = g_list_remove_link(playlist_mgr->queue_list, remove);
-                       g_list_free(remove);
-               }
-       }
-#endif
-
        /*select list*/
        __mp_playlist_mgr_select_list(playlist_mgr);
 
@@ -540,19 +349,9 @@ void mp_playlist_mgr_clear(mp_plst_mgr *playlist_mgr)
                g_list_free(playlist_mgr->shuffle_list);
        }
 
-#ifdef MP_FEATURE_PLST_QUEUE
-       if (playlist_mgr->queue_list) {
-               playlist_mgr->normal_list = g_list_copy(playlist_mgr->queue_list);
-               playlist_mgr->shuffle_list = g_list_copy(playlist_mgr->queue_list);
-
-               __mp_playlist_mgr_select_list(playlist_mgr);
-       } else
-#endif
-       {
-               playlist_mgr->normal_list = NULL;
-               playlist_mgr->shuffle_list = NULL;
-               playlist_mgr->list = NULL;
-       }
+       playlist_mgr->normal_list = NULL;
+       playlist_mgr->shuffle_list = NULL;
+       playlist_mgr->list = NULL;
 
        mp_playlist_mgr_set_list_type(playlist_mgr, MP_PLST_TYPE_NONE);
 
@@ -574,7 +373,6 @@ void mp_playlist_mgr_clear(mp_plst_mgr *playlist_mgr)
 
 int mp_playlist_mgr_count(mp_plst_mgr *playlist_mgr)
 {
-       /* startfunc; */
        MP_CHECK_VAL(playlist_mgr, 0);
        MP_CHECK_VAL(playlist_mgr->list, 0);
        return g_list_length(playlist_mgr->list);
@@ -675,7 +473,6 @@ mp_plst_item *mp_playlist_mgr_get_prev(mp_plst_mgr *playlist_mgr)
 
 mp_plst_item *mp_playlist_mgr_get_nth(mp_plst_mgr *playlist_mgr, int index)
 {
-       /* startfunc; */
        MP_CHECK_VAL(playlist_mgr, NULL);
        MP_CHECK_VAL(playlist_mgr->list, NULL);
        return (mp_plst_item *)g_list_nth_data(playlist_mgr->list, index);
@@ -683,7 +480,6 @@ mp_plst_item *mp_playlist_mgr_get_nth(mp_plst_mgr *playlist_mgr, int index)
 
 mp_plst_item *mp_playlist_mgr_normal_list_get_nth(mp_plst_mgr *playlist_mgr, int index)
 {
-       /* startfunc; */
        MP_CHECK_VAL(playlist_mgr, NULL);
        MP_CHECK_VAL(playlist_mgr->normal_list, NULL);
        return (mp_plst_item *)g_list_nth_data(playlist_mgr->normal_list, index);
@@ -691,7 +487,6 @@ mp_plst_item *mp_playlist_mgr_normal_list_get_nth(mp_plst_mgr *playlist_mgr, int
 
 mp_plst_item *mp_playlist_mgr_get_item_by_uid(mp_plst_mgr *playlist_mgr, const char *uid)
 {
-       /* startfunc; */
        MP_CHECK_VAL(playlist_mgr, NULL);
        MP_CHECK_VAL(playlist_mgr->list, NULL);
        MP_CHECK_VAL(uid, NULL);
@@ -744,10 +539,6 @@ void mp_playlist_mgr_set_shuffle_first_item(mp_plst_mgr *playlist_mgr, mp_plst_i
        playlist_mgr->shuffle_list = g_list_prepend(playlist_mgr->shuffle_list, data);
 
        __mp_playlist_mgr_select_list(playlist_mgr);
-#ifdef __PRINT_PLAYLIST_ITEMS__
-       DEBUG_TRACE("shuffle list");
-       g_list_foreach(playlist_mgr->shuffle_list, __playlist_print_list, playlist_mgr->shuffle_list);
-#endif
 }
 
 void mp_playlist_mgr_set_current(mp_plst_mgr *playlist_mgr, mp_plst_item *cur)
@@ -761,31 +552,6 @@ void mp_playlist_mgr_set_current(mp_plst_mgr *playlist_mgr, mp_plst_item *cur)
                cur = mp_playlist_mgr_get_nth(playlist_mgr, 0);
        }
        MP_CHECK(cur);
-#ifdef __PRINT_PLAYLIST_ITEMS__
-       DEBUG_TRACE("normal list");
-       g_list_foreach(playlist_mgr->normal_list, __playlist_print_list, playlist_mgr->normal_list);
-       DEBUG_TRACE("shuffle list");
-       g_list_foreach(playlist_mgr->shuffle_list, __playlist_print_list, playlist_mgr->shuffle_list);
-#endif
-#ifdef MP_FEATURE_PLST_QUEUE
-       bool insert_queue = false;
-       /*remove queue item*/
-       before = mp_playlist_mgr_get_current(playlist_mgr);
-       if (before && before->is_queue) {
-               DEBUG_TRACE("queue spent");
-               before_index = playlist_mgr->current_index;
-
-               call_remove_item_callback = true;
-
-               mp_playlist_mgr_item_remove_item(playlist_mgr, before);
-       }
-
-       /*clear queue item if needed*/
-       if (!cur->is_queue && playlist_mgr->queue_list) {
-               __mp_playlist_mgr_clear_queue(playlist_mgr);
-               insert_queue = true;
-       }
-#endif
        /*set current*/
        index = g_list_index(playlist_mgr->list, cur);
        if (index < 0) {
@@ -796,18 +562,7 @@ void mp_playlist_mgr_set_current(mp_plst_mgr *playlist_mgr, mp_plst_item *cur)
 
        DEBUG_TRACE("cur: %s, index: %d", cur->uri, playlist_mgr->current_index);
 
-#ifdef MP_FEATURE_PLST_QUEUE
-       /*insert queue item after cur*/
-       if (insert_queue) {
-               __mp_playlist_mgr_insert_queue_links(playlist_mgr);
-       }
-#endif
 finish:
-#ifdef MP_FEATURE_PLST_QUEUE
-       if (call_remove_item_callback && playlist_mgr->queue_item_cb) {
-               playlist_mgr->queue_item_cb(MP_PLSYLIST_QUEUE_REMOVED, before_index, playlist_mgr->userdata);
-       }
-#endif
        if (playlist_mgr->item_change_cb) {
                playlist_mgr->item_change_cb(cur, playlist_mgr->item_change_userdata);
        }
@@ -842,7 +597,6 @@ bool mp_playlist_mgr_get_shuffle(mp_plst_mgr *playlist_mgr)
 
 Eina_Bool mp_playlist_mgr_is_shuffle(mp_plst_mgr *playlist_mgr)
 {
-       /* startfunc; */
        MP_CHECK_VAL(playlist_mgr, 0);
        return playlist_mgr->shuffle_state;
 }
@@ -863,18 +617,6 @@ int mp_playlist_mgr_get_repeat(mp_plst_mgr *playlist_mgr)
        endfunc;
 }
 
-#ifdef MP_FEATURE_PLST_QUEUE
-Eina_Bool mp_playlist_mgr_set_queue_cb(mp_plst_mgr *playlist_mgr, mp_queue_item_removed_cb cb, void *userdata)
-{
-       MP_CHECK_VAL(playlist_mgr, 0);
-
-       playlist_mgr->userdata = userdata;
-       playlist_mgr->queue_item_cb = cb;
-
-       return true;
-}
-#endif
-
 int mp_playlist_mgr_set_item_change_callback(mp_plst_mgr *playlist_mgr, mp_playlist_item_change_callback cb, void *userdata)
 {
        MP_CHECK_VAL(playlist_mgr, 0);
index 61e9095..8ffcfd8 100644 (file)
@@ -92,7 +92,6 @@
 #endif
 #define MP_MMC_DIR     "/opt/storage/sdcard"
 #define MP_MUSIC_DIR   "/opt/usr/media"
-#define MP_HTTP_DIR "http://"
 
 #ifdef PATH_MAX
 #      define MAX_NAM_LEN   PATH_MAX
index b94d23a..07e1ea0 100644 (file)
@@ -130,17 +130,13 @@ do{\
 
 #define eventfunc              EVENT_TRACE("");
 
-#ifdef ENABLE_CHECK_START_END_FUNCTION
 #ifndef startfunc
 #define startfunc              VER_TRACE("+-  START -");
 #endif
+
 #ifndef endfunc
 #define endfunc                VER_TRACE("+-  END  -");
 #endif
-#else
-#define startfunc
-#define endfunc
-#endif
 
 #define mp_ret_if(expr) do { \
        if(expr) { \
index 6d39542..a182891 100644 (file)
@@ -26,7 +26,6 @@
 #include <glib.h>
 #include <notification.h>
 #include <Ecore_IMF.h>
-//#include <Ecore_X.h>
 #include <Edje.h>
 #include <errno.h>
 #include <libintl.h>
@@ -53,8 +52,6 @@
 #include "mp-view-mgr.h"
 #include "mp-popup.h"
 
-//E_DBus_Connection *EDBusHandle;
-
 typedef struct
 {
 
@@ -280,8 +277,6 @@ struct appdata
 
        mp_player_state player_state;
 
-       //mp_drm drm_info;
-
        mp_plst_mgr *playlist_mgr;
 
        mp_track_type_e track_type;     // Support voice ui
index 0e80146..aecdb44 100644 (file)
@@ -1059,7 +1059,6 @@ mp_create(void *data)
        MP_CHECK_VAL(path, EINA_FALSE);
        snprintf(edje_path, 1024, "%s%s/%s", path, "edje", THEME_NAME);
 
-       /*Elm_Theme *th = elm_theme_new();*/
        elm_theme_extension_add(NULL, edje_path);
        PROFILE_OUT("elm_theme_extension_add");
 
index 2d8065f..470ec57 100644 (file)
@@ -79,7 +79,6 @@ _mp_detail_view_get_location_info_from_file_path(char *file_path)
 static void
 _mp_detail_view_append_media_info_item(Evas_Object *genlist, char *header, char *detail)
 {
-       /*startfunc;*/
        MpDetailView_t *view = NULL;
        mp_media_info_t *info = NULL;