This patch fixes svace issues 33/244133/3 submit/tizen/20200915.110539
authorJagrat Patidar <j1.patidar@samsung.com>
Tue, 15 Sep 2020 07:52:29 +0000 (13:22 +0530)
committerAmritanshu Pandia <a.pandia1@samsung.com>
Tue, 15 Sep 2020 11:04:27 +0000 (11:04 +0000)
Change-Id: Ib37786eaf000faa04dd9bcf2b298c27f018d5174

19 files changed:
music-chooser/src/mc-common.c
music-chooser/src/mc-group-list.c
music-chooser/src/mc-search-list.c
music-chooser/src/mc-select-view.c
src/common/mp-common.c
src/common/mp-edit-callback.c
src/common/mp-media-info.c
src/common/mp-util.c
src/view/mp-player-view.c
src/view/mp-set-as-view.c
src/widget/mp-album-list.c
src/widget/mp-artist-detail-list.c
src/widget/mp-artist-list.c
src/widget/mp-edit-playlist.c
src/widget/mp-genre-list.c
src/widget/mp-now-playing-list.c
src/widget/mp-now-playing.c
src/widget/mp-playlist-list.c
src/widget/mp-search-list.c

index 9663ac97dc13ed31b21331311435a192e6f97fc4..0f717a62a840f6527a6e08f20948c98b853e7f8a 100755 (executable)
@@ -25,6 +25,7 @@
 #include <efl_extension.h>
 #include <mp-file-util.h>
 #include <storage/storage.h>
+#include <media_content.h>
 
 #define MC_FILE_PREFIX "file://"
 
@@ -255,8 +256,13 @@ bool mc_check_file_exist(const char *path)
        }
 
        bool mmc_removed = mc_is_mmc_removed();
-
-       if (mmc_removed && strstr(path, MP_MMC_ROOT_PATH) == path) {
+       char *root_path = MP_MMC_ROOT_PATH;
+       if(root_path == NULL)
+       {
+               ERROR_TRACE("failed to get mmc root path");
+               return false;
+       }
+       if (mmc_removed && strstr(path, root_path) == path) {
                return false;
        }
 
@@ -320,7 +326,9 @@ char *mc_artist_text_get(void *data, Evas_Object * obj, const char *part)
 
        if (strcmp(part, "elm.text") == 0) {
                mp_media_info_group_get_main_info(handle, &text);
-               return g_strdup(text);
+               char *artist_text = g_strdup(text);
+               IF_FREE(text);
+               return artist_text;
        } else if (strcmp(part, "elm.text.sub") == 0) {
                char **album_thumbs = NULL;
                int song_count;
@@ -357,15 +365,28 @@ char *mc_album_text_get(void *data, Evas_Object * obj, const char *part)
        int ret = 0;
        if (strcmp(part, "elm.text") == 0) {
                ret = mp_media_info_group_get_main_info(handle, &text);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(text);
+
                MP_CHECK_NULL(ret == 0);
-               return g_strdup(text);
+               char *label = g_strdup(text);
+               IF_FREE(text);
+               return label;
        } else if (strcmp(part, "elm.text.sub") == 0) {
                ret = mp_media_info_group_get_sub_info(handle, &text);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(text);
+
                MP_CHECK_NULL(ret == 0);
-               return g_strdup(text);
+               char *label = g_strdup(text);
+               IF_FREE(text);
+               return label;
        } else if (strcmp(part, "elm.text.3") == 0) {
                int count;
                ret = mp_media_info_group_get_main_info(handle, &text);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(text);
+
                MP_CHECK_NULL(ret == 0);
                ret =
                        mp_media_info_list_count(MP_TRACK_BY_ALBUM, text, NULL, NULL,
@@ -429,17 +450,27 @@ char *mc_folder_list_label_get(void *data, Evas_Object * obj,
        if (!strcmp(part, "elm.text.main.left.top")
                || !strcmp(part, "elm.slide.text.1")) {
                ret = mp_media_info_group_get_main_info(svc_item, &name);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
+                       IF_FREE(name);
                        name = GET_SYS_STR("IDS_COM_BODY_UNKNOWN");
+                       if (!strcmp(part, "elm.text.main.left.top")) {
+                               return elm_entry_utf8_to_markup(name);
+                       } else {
+                               return g_strdup(name);
+                       }
                }
-
+               char *label = NULL;
                if (!strcmp(part, "elm.text.main.left.top")) {
-                       return elm_entry_utf8_to_markup(name);
+                       label = elm_entry_utf8_to_markup(name);
                } else {
-                       return g_strdup(name);
+                       label = g_strdup(name);
                }
-
+               IF_FREE(name);
+               return label;
        } else if (!strcmp(part, "elm.text.sub.left.bottom")) {
                ret = mp_media_info_group_get_sub_info(svc_item, &name);
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
index 717f99d42640131ade4e58f8a08152ebfb53c89d..c695bc0d8fbc09c4ca0bf0741857fa4f59d1ce4d 100755 (executable)
@@ -99,6 +99,8 @@ static void _gl_sel_cb(void *data, Evas_Object * obj, void *event_info)
                mc_common_push_track_view_by_group_name(ld->ad, track_type, name,
                                                                                                playlist_id, NULL);
        }
+       IF_FREE(name);
+       IF_FREE(folder_name);
 }
 
 static void
index 282cebb5c7d88deffd26cc63e8efd6baaa90dd12..66e6a6ae072c3df79d5f54d6457c7538ab16aeb5 100755 (executable)
@@ -18,6 +18,7 @@
 #include "music-chooser.h"
 #include "mc-track-list.h"
 #include "mc-common.h"
+#include <media_content.h>
 
 static void _mc_search_list_popup_to_bottom(struct app_data *ad)
 {
@@ -193,23 +194,39 @@ static char *_mc_search_album_list_label_get(void *data, Evas_Object * obj,
 
        if (!strcmp(part, "elm.text.1") || !strcmp(part, "elm.slide.text.1")) {
                ret = mp_media_info_group_get_main_info(svc_item, &name);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
+                       IF_FREE(name);
                        name = GET_SYS_STR("IDS_COM_BODY_UNKNOWN");
+                       if (!strcmp(part, "elm.text.1")) {
+                               bool res = false;
+                               char *markup_name =
+                                       (char *) mc_common_search_markup_keyword(name,
+                                                                                                                list->filter_str,
+                                                                                                                &res);
+                               return (res) ? g_strdup(markup_name) :
+                                       elm_entry_utf8_to_markup(name);
+                       } else {
+                               return g_strdup(name);
+                       }
                }
-
+               char *label = NULL;
                if (!strcmp(part, "elm.text.1")) {
                        bool res = false;
                        char *markup_name =
                                (char *) mc_common_search_markup_keyword(name,
                                                                                                                 list->filter_str,
                                                                                                                 &res);
-                       return (res) ? g_strdup(markup_name) :
+                       label = (res) ? g_strdup(markup_name) :
                                elm_entry_utf8_to_markup(name);
                } else {
-                       return g_strdup(name);
+                       label = g_strdup(name);
                }
-
+               IF_FREE(name);
+               return label;
        } else if (!strcmp(part, "elm.text.2")) {
                ret = mp_media_info_group_get_sub_info(svc_item, &name);
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
@@ -274,6 +291,9 @@ _mc_search_album_select_cb(void *data, Evas_Object * obj, void *event_info)
        if (gli_data->handle) {
                ret = mp_media_info_group_get_main_info(gli_data->handle, &name);
                DEBUG_TRACE("thumbnail=%s", thumbnail);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retm_if(ret != 0, "Fail to get value");
                mp_retm_if(name == NULL, "Fail to get value");
 
@@ -302,9 +322,20 @@ static char *_mc_search_artist_list_label_get(void *data,
 
        if (!strcmp(part, "elm.text")) {
                ret = mp_media_info_group_get_main_info(svc_item, &name);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
+                       IF_FREE(name);
                        name = GET_SYS_STR("IDS_COM_BODY_UNKNOWN");
+                       bool res = false;
+                       char *markup_name =
+                               (char *) mc_common_search_markup_keyword(name,
+                                                                                                        list->filter_str,
+                                                                                                        &res);
+                       return (res) ? g_strdup(markup_name) :
+                               elm_entry_utf8_to_markup(name);
                }
 
                bool res = false;
@@ -312,8 +343,10 @@ static char *_mc_search_artist_list_label_get(void *data,
                        (char *) mc_common_search_markup_keyword(name,
                                                                                                         list->filter_str,
                                                                                                         &res);
-               return (res) ? g_strdup(markup_name) :
+               char *label = (res) ? g_strdup(markup_name) :
                        elm_entry_utf8_to_markup(name);
+               IF_FREE(name);
+               return label;
        }
        return NULL;
 }
index 922e26de9b7bc620d7bf1ef21aae927f80835555..dcc2d17457cce830b6d71e7e436bbf2206128bf9 100755 (executable)
@@ -233,7 +233,7 @@ static void _gl_sel(void *data, Evas_Object * obj, void *event_info)
        char *thumbnail_path = NULL;
        mp_media_info_h media = elm_object_item_data_get(event_info);
        MP_CHECK(media);
-       mp_media_info_group_get_main_info(media, &title);
+
        mp_media_info_group_get_thumbnail_path(media, &thumbnail_path);
 
        if (vd->type == MP_GROUP_BY_PLAYLIST) {
index 46c6ccb2693fdcccd12017f46910b48cbda1535d..a2d2df29f8a6f31f17828dd5a4a00a842385478f 100755 (executable)
@@ -117,9 +117,13 @@ void mp_common_add_to_playlsit_view(void *list_view)
        elm_box_horizontal_set(box, EINA_TRUE);
        elm_box_padding_set(box, ELM_SCALE_SIZE(20), 0);
 
-       elm_box_pack_end(box, ((MpListView_t *) edit_view)->cancel_btn);
+       if ((MpListView_t *) edit_view) {
+               if (((MpListView_t *) edit_view)->cancel_btn)
+                       elm_box_pack_end(box, ((MpListView_t *) edit_view)->cancel_btn);
 
-       elm_box_pack_end(box, ((MpListView_t *) edit_view)->done_btn);
+               if (((MpListView_t *) edit_view)->done_btn)
+                       elm_box_pack_end(box, ((MpListView_t *) edit_view)->done_btn);
+       }
 
        /* Title Content */
        elm_object_item_part_content_set(((MpListView_t *)edit_view)->navi_it, "title_content", box);
@@ -195,16 +199,20 @@ mp_common_show_edit_view(void *list_view, mp_done_operator_type_t type)
        elm_box_horizontal_set(box, EINA_TRUE);
        elm_box_padding_set(box, ELM_SCALE_SIZE(20), 0);
 
-       elm_box_pack_end(box, ((MpListView_t *) edit_view)->cancel_btn);
+       if ((MpListView_t *) edit_view) {
+               if (((MpListView_t *) edit_view)->cancel_btn)
+                       elm_box_pack_end(box, ((MpListView_t *) edit_view)->cancel_btn);
 
-       elm_box_pack_end(box, ((MpListView_t *) edit_view)->done_btn);
+               if (((MpListView_t *) edit_view)->done_btn)
+                       elm_box_pack_end(box, ((MpListView_t *) edit_view)->done_btn);
 
-       /* Title Content */
-       elm_object_item_part_content_set(((MpListView_t *)edit_view)->navi_it, "title_content", box);
+               /* Title Content */
+               elm_object_item_part_content_set(((MpListView_t *)edit_view)->navi_it, "title_content", box);
 
-       elm_object_part_content_set(((MpListView_t *) edit_view)->layout, "edit_list_content", ((MpListView_t *) edit_view)->content_to_show->layout);
-       elm_object_signal_emit(((MpListView_t *) edit_view)->content_to_show->layout, "control_hide_signal", "control_hide_source");
-       elm_object_signal_emit(((MpListView_t *) edit_view)->content_to_show->layout, "full_signal", "full_source");
+               elm_object_part_content_set(((MpListView_t *) edit_view)->layout, "edit_list_content", ((MpListView_t *) edit_view)->content_to_show->layout);
+               elm_object_signal_emit(((MpListView_t *) edit_view)->content_to_show->layout, "control_hide_signal", "control_hide_source");
+               elm_object_signal_emit(((MpListView_t *) edit_view)->content_to_show->layout, "full_signal", "full_source");
+       }
 }
 
 /*
@@ -1417,6 +1425,9 @@ static bool _mp_common_multiple_view_operation(app_control_h app_control)
                        mp_plst_item *item =
                                mp_playlist_mgr_item_append(ad->playlist_mgr, path, NULL,
                                                                                        NULL, NULL, MP_TRACK_URI);
+                       if (!item)
+                               IF_FREE(path);
+
                        MP_CHECK_FALSE(item);
                        if (thumbs) {
                                item->thumbnail_path = g_strdup(thumbs[i]);
@@ -1745,6 +1756,7 @@ static bool _mp_common_load_playlist_detail_view(char *shortcut_main_info)
        char *name = NULL;
 
        if (mp_media_info_playlist_get_name_by_id(id, &name)) {
+               IF_FREE(name);
                return false;
        }
 
@@ -2317,6 +2329,9 @@ void mp_common_playlist_rename_cb(void *data, Evas_Object * obj,
                Mp_Playlist_Data *mp_playlist_data =
                        mp_edit_playlist_create(MP_PLST_RENAME);
                MP_CHECK(mp_playlist_data);
+               if (!item_data)
+                       IF_FREE(mp_playlist_data);
+
                MP_CHECK(item_data);
                mp_playlist_data->playlist_handle = item_data->handle;
                mp_edit_playlist_content_create(mp_playlist_data);
index 122ef65257dd372768c1db0895ab7b04d5c879c6..38f3df4d09c255948b2bda3d390b01ae69c3d380 100755 (executable)
@@ -32,6 +32,7 @@
 #include "mp-minicontroller.h"
 #include "mp-lockscreenmini.h"
 #include "mp-file-util.h"
+#include <media_content.h>
 
 #ifdef MP_FEATURE_PERSONAL_PAGE
 #include <sys/stat.h>
@@ -207,6 +208,7 @@ _mp_edit_cb_add_to_playlist_cb(void *data, Evas_Object * obj,
        mp_popup_destroy(ad);
        mp_edit_cb_excute_add_to_playlist(gli_data->item_data, g_playlist_id,
                                                                          playlist_name, true);
+       IF_FREE(playlist_name);
 }
 
 /*
@@ -281,11 +283,15 @@ void mp_edit_create_add_to_playlist_popup(void *data)
                        item = mp_media_info_group_list_nth_item(media_list, i);
 
                        ret = mp_media_info_group_get_main_info(item, &name);
+                       if (ret != MEDIA_CONTENT_ERROR_NONE) {
+                               IF_FREE(name);
+                       }
                        mp_retm_if(ret != 0, "Fail to get value");
                        mp_genlist_popup_item_append(popup, name, NULL, NULL,
                                                                                 (void *) list,
                                                                                 _mp_edit_cb_add_to_playlist_cb,
                                                                                 (void *) item);
+                       IF_FREE(name);
                }
 
                evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL,
index 6813d2c8cf0686ae6ce6aac0b7bc71b400457384..9ff8d56ab270a2d870d100f66d4c86ea2d954f33 100755 (executable)
@@ -840,6 +840,7 @@ int mp_media_info_list_create_w_filter(mp_track_type_e track_type,
                                                                           int playlist_id, mp_filter_h filter,
                                                                           mp_media_list_h * media_list)
 {
+
        int res = MEDIA_CONTENT_ERROR_NONE;
 
        MP_CHECK_VAL(media_list, -1);
@@ -995,10 +996,6 @@ int mp_media_info_create(mp_media_info_h * media_info,
 
        (*media_info)->i.minfo = calloc(1, sizeof(struct mp_minfo_s));
        MP_CHECK_VAL((*media_info)->i.minfo, -1);
-       if (!(*media_info)->i.minfo) {
-               SAFE_FREE(*media_info);
-               return -1;
-       }
 
        res = media_info_get_media_from_db(media_id, &(*media_info)->h.media);
        if (res != MEDIA_CONTENT_ERROR_NONE) {
@@ -1412,10 +1409,10 @@ int mp_media_info_get_year(mp_media_info_h media, char **year)
                strncpy(media->i.minfo->year, default_year, (strlen(default_year) + 1));
                IF_G_FREE(default_year);
        }
-       if (media->i.minfo->year) {
-               *year = media->i.minfo->year;
-               PRINT_STR(*year);
-       }
+
+       *year = media->i.minfo->year;
+       PRINT_STR(*year);
+
        return res;
 }
 
index cc779f55ffca80aba6a837187648097463c246ff..b9fded9bd611e0fd3abf1c5e57a920f4aa3eea06 100755 (executable)
@@ -182,9 +182,9 @@ static const char *_mp_util_get_single(const char *p)
 {
        int c = (int) *p;
 
-       if (islower(c) != 0) {
+       if (islower(c) != 0 && c >= 97 && c <= 122) {
                return single_lower_index[c - 'a'];
-       } else if (isupper(c) != 0) {
+       } else if (isupper(c) != 0 && c >= 65 && c <= 90) {
                return single_upper_index[c - 'A'];
        } else if (48 <= c && 57 >= c) {
                return single_numeric_index[c - '0'];
index d3a3e6d56c28be25580ded4067e9ef12db04f8c3..2b7a0af3750da92efb21ce508a9ca0efc49c66ea 100755 (executable)
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <media_content.h>
 #include <glib.h>
 #include "mp-player-view.h"
 #include "mp-widget.h"
@@ -836,6 +837,9 @@ _mp_player_view_add_playlist_select_cb(void *data, Evas_Object * obj,
        }
 #endif
 
+       if (ret != MEDIA_CONTENT_ERROR_NONE)
+               IF_FREE(playlist_name);
+
        mp_retm_if(ret != 0, "Fail to get value");
 
        bool result = false;
@@ -875,7 +879,7 @@ _mp_player_view_add_playlist_select_cb(void *data, Evas_Object * obj,
 #ifdef MP_PLAYLIST_MAX_ITEM_COUNT
   END:
 #endif
-
+       IF_FREE(playlist_name);
        mp_popup_destroy(ad);
        return;
 }
@@ -958,11 +962,15 @@ static void _ctxpopup_add_to_playlist_cb(void *data, Evas_Object * obj,
                        mp_retm_if(!plst, "Fail to get item");
 
                        ret = mp_media_info_group_get_main_info(plst, &name);
+                       if (ret != MEDIA_CONTENT_ERROR_NONE) {
+                               IF_FREE(name);
+                       }
                        mp_retm_if(ret != 0, "Fail to get value");
 
                        mp_genlist_popup_item_append(popup, name, NULL, NULL, plst,
                                                                                 _mp_player_view_add_playlist_select_cb,
                                                                                 handle);
+                       IF_FREE(name);
                }
 
        } else {
index ec2528029be8550c7dced9f2e66352c7024c15bd..5a883d2d67a20761b472ad23a45484bc2bddcd2b 100755 (executable)
@@ -429,7 +429,7 @@ static Evas_Object *_mp_set_as_view_gl_contents_get(void *data,
                        break;
                case MP_SET_AS_RECOMMEND_PRE_LISTEN:
                        item_class = elm_genlist_item_item_class_get(item_data->item);
-                       if (!g_strcmp0
+                       if (item_class && item_class->item_style && !g_strcmp0
                                (item_class->item_style, "music/1icon/set_as_full")) {
                                if (!mp_util_is_landscape()) {
                                        content =
@@ -497,7 +497,7 @@ static Evas_Object *_mp_set_as_view_gl_contents_get(void *data,
                                                                                                                  total_time);
                                IF_FREE(total_time);
                        } else
-                               if (!g_strcmp0
+                               if (item_class && item_class->item_style && !g_strcmp0
                                        (item_class->item_style, "music/1icon/set_as_text")) {
                                content =
                                        mp_common_load_edj(obj, MP_EDJ_NAME,
index 06fe0d7e2cd5ddb6a8e8ca2292eaa8caaee85fe3..46d5a7d212562517a7eb9b275065a5e56e091aeb 100755 (executable)
@@ -15,7 +15,7 @@
  */
 
 #include <stdio.h>
-
+#include <media_content.h>
 #include "mp-album-list.h"
 #include "mp-track-list.h"
 #include "mp-album-detail-view.h"
@@ -155,13 +155,19 @@ static char *_mp_album_list_label_get(void *data, Evas_Object * obj,
 
        if (!strcmp(part, "elm.text")) {
                ret = mp_media_info_group_get_main_info(svc_item, &name);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
+                       IF_FREE(name);
                        name = GET_SYS_STR("IDS_COM_BODY_UNKNOWN");
+                       return elm_entry_utf8_to_markup(name);
                }
 
-               return elm_entry_utf8_to_markup(name);
-
+               char *label = elm_entry_utf8_to_markup(name);
+               IF_FREE(name);
+               return label;
        } else if (!strcmp(part, "elm.text.sub")) {
                ret = mp_media_info_group_get_sub_info(svc_item, &name);
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
@@ -314,6 +320,9 @@ _mp_album_select_cb(void *data, Evas_Object * obj, void *event_info)
                mp_media_info_group_get_thumbnail_path(gli_data->handle,
                                                                                           &thumbnail);
                DEBUG_TRACE("thumbnail=%s", thumbnail);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retm_if(ret != 0, "Fail to get value");
                mp_retm_if(name == NULL, "Fail to get value");
 
@@ -323,9 +332,15 @@ _mp_album_select_cb(void *data, Evas_Object * obj, void *event_info)
 
        if (list->function_type == MP_LIST_FUNC_ADD_TRACK) {
                MpViewMgr_t *view_manager = mp_view_mgr_get_view_manager();
+               if (!view_manager)
+                       IF_FREE(name);
+
                MP_CHECK(view_manager);
                MpSelectTrackView_t *view_select_track =
                        mp_select_track_view_create(view_manager->navi);
+               if (!view_select_track)
+                       IF_FREE(name);
+
                MP_CHECK(view_select_track);
                mp_view_mgr_push_view(view_manager, (MpView_t *) view_select_track,
                                                          NULL);
@@ -366,6 +381,7 @@ _mp_album_select_cb(void *data, Evas_Object * obj, void *event_info)
                elm_object_part_content_set(((MpListView_t *)view_select_track)->layout, "edit_list_content", view_select_track->content_to_show->layout);
                elm_object_signal_emit(view_select_track->content_to_show->layout, "control_hide_signal", "control_hide_source");
                elm_object_signal_emit(view_select_track->content_to_show->layout, "full_signal", "full_source");
+               IF_FREE(name);
                return;
        }
 
@@ -375,11 +391,15 @@ _mp_album_select_cb(void *data, Evas_Object * obj, void *event_info)
                MpViewMgr_t *view_mgr = mp_view_mgr_get_view_manager();
                MpView_t *view = mp_view_mgr_get_top_view(view_mgr);
                mp_view_update_options_edit(view);
+               IF_FREE(name);
                return;
        }
 
        /* create the view of album detail */
        MpViewMgr_t *view_manager = mp_view_mgr_get_view_manager();
+       if (!view_manager)
+               IF_FREE(name);
+
        MP_CHECK(view_manager);
        MpAlbumDetailView_t *view_album_detail =
                mp_album_detail_view_create(view_manager->navi, name, artist,
@@ -389,6 +409,7 @@ _mp_album_select_cb(void *data, Evas_Object * obj, void *event_info)
 
        mp_view_update_options((MpView_t *) view_album_detail);
        mp_view_set_title((MpView_t *) view_album_detail, name);
+       IF_FREE(name);
 }
 
 static void _mp_album_list_append_group_index_item(void *thiz)
@@ -491,6 +512,9 @@ static void _mp_album_list_load_list(void *thiz, int count)
 
                mp_list_item_data_t *item_data;
                item_data = calloc(1, sizeof(mp_list_item_data_t));
+               if (!item_data)
+                       IF_FREE(title);
+
                MP_CHECK(item_data);
                item_data->handle = item;
                item_data->index = index;
@@ -514,6 +538,7 @@ static void _mp_album_list_load_list(void *thiz, int count)
                }
                item_data->it = list_item;
                elm_object_item_data_set(item_data->it, item_data);
+               IF_FREE(title);
        }
 
        END:
@@ -844,168 +869,6 @@ static void _mp_album_list_recently_added_play_icon_clicked_cb(void *data,
        mp_play_new_file(ad, TRUE);
 }
 
-static void _mp_album_list_recently_added_thumbpath_clicked_cb(void *data,
-               Evas_Object * obj, const char *emission, const char *source)
-{
-       startfunc;
-       mp_list_item_data_t *item = (mp_list_item_data_t *)data;
-       MP_CHECK(item);
-
-       struct appdata *ad = mp_util_get_appdata();
-       MP_CHECK(ad);
-
-       Evas_Object* genlist = evas_object_data_get(obj, "genlist_obj");
-       MP_CHECK(genlist);
-
-       MpAlbumList_t *list = evas_object_data_get(genlist, "list_data");
-       MP_CHECK(list);
-
-       mp_media_info_h track = item->handle;
-       MP_CHECK(track);
-
-       int ret = 0;
-       int index = 0;
-       char *name = NULL;
-       char *artist = NULL;
-       char *default_artist = NULL;
-       char *title = NULL;
-       char *thumbnail = NULL;
-
-       index = item->index;
-
-       DEBUG_TRACE("index is %d", index);
-       if (index >= 0) {
-               DEBUG_TRACE("");
-               ret = mp_media_info_group_get_main_info(track, &name);
-               DEBUG_TRACE("");
-               ret = mp_media_info_group_get_sub_info(track, &artist);
-               DEBUG_TRACE("");
-               mp_media_info_group_get_thumbnail_path(track,
-                               &thumbnail);
-               DEBUG_TRACE("thumbnail=%s", thumbnail);
-               mp_retm_if(ret != 0, "Fail to get value");
-               mp_retm_if(name == NULL, "Fail to get value");
-
-               if (!name || !strlen(name)) {
-                       name = g_strdup(GET_SYS_STR("IDS_COM_BODY_UNKNOWN"));
-               }
-               if (!artist || !strlen(artist)) {
-                       artist = g_strdup(GET_SYS_STR("IDS_COM_BODY_UNKNOWN"));
-                       default_artist = artist;
-               }
-               title = name;
-       }
-
-
-       if (list->function_type == MP_LIST_FUNC_ADD_TRACK) {
-               MpViewMgr_t *view_manager = mp_view_mgr_get_view_manager();
-               if (!view_manager) {
-                       if (name) {
-                               free(name);
-                               name = NULL;
-                       }
-                       if (default_artist) {
-                               free(default_artist);
-                               default_artist = NULL;
-                       }
-                       return;
-               }
-               MpSelectTrackView_t *view_select_track =
-                               mp_select_track_view_create(view_manager->navi);
-               if (!view_select_track) {
-                       if (name) {
-                               free(name);
-                               name = NULL;
-                       }
-                       if (default_artist) {
-                               free(default_artist);
-                               default_artist = NULL;
-                       }
-                       return;
-               }
-               mp_view_mgr_push_view(view_manager, (MpView_t *) view_select_track,
-                               NULL);
-
-               int count = g_list_length(ad->checkedList);
-               if (count > 0) {
-                       char *text = g_strdup_printf(GET_STR(STR_MP_SELECT_ITEMS), count);
-                       mp_view_set_title((MpView_t *) view_select_track, text);
-                       IF_FREE(text);
-               } else {
-                       mp_view_set_title((MpView_t *) view_select_track, STR_MP_TILTE_SELECT_ITEM);
-               }
-               mp_track_list_set_data((MpTrackList_t *) view_select_track->
-                               content_to_show, MP_TRACK_LIST_TYPE,
-                               MP_TRACK_BY_ALBUM, MP_TRACK_LIST_TYPE_STR,
-                               name, -1);
-               mp_list_view_set_cancel_btn((MpListView_t *) view_select_track,
-                               true);
-               mp_list_view_set_done_btn((MpListView_t *) view_select_track, true,
-                               MP_DONE_SELECT_ADD_TRACK_TYPE);
-               mp_list_view_set_select_all((MpListView_t *) view_select_track,
-                               TRUE);
-               mp_list_update(view_select_track->content_to_show);
-               mp_view_update_options((MpView_t *) view_select_track);
-               mp_list_set_edit(view_select_track->content_to_show, TRUE);
-               if (name) {
-                       free(name);
-                       name = NULL;
-               }
-               if (default_artist) {
-                       free(default_artist);
-                       default_artist = NULL;
-               }
-               return;
-       }
-
-       if (list->edit_mode) {
-               mp_list_edit_mode_sel((MpList_t *) list, item);
-               MpViewMgr_t *view_mgr = mp_view_mgr_get_view_manager();
-               MpView_t *view = mp_view_mgr_get_top_view(view_mgr);
-               mp_view_update_options_edit(view);
-               if (name) {
-                       free(name);
-                       name = NULL;
-               }
-               if (default_artist) {
-                       free(default_artist);
-                       default_artist = NULL;
-               }
-               return;
-       }
-
-
-       /* create the view of album detail */
-       MpViewMgr_t *view_manager = mp_view_mgr_get_view_manager();
-       if (!view_manager) {
-               if (name) {
-                       free(name);
-                       name = NULL;
-               }
-               if (default_artist) {
-                       free(default_artist);
-                       default_artist = NULL;
-               }
-               return;
-       }
-       MpAlbumDetailView_t *view_album_detail =
-                       mp_album_detail_view_create(view_manager->navi, name, artist,
-                                       thumbnail);
-       mp_view_mgr_push_view(view_manager, (MpView_t *) view_album_detail,
-                       NULL);
-
-       mp_view_update_options((MpView_t *) view_album_detail);
-       mp_view_set_title((MpView_t *) view_album_detail, name);
-       if (name) {
-               free(name);
-               name = NULL;
-       }
-       if (default_artist) {
-               free(default_artist);
-               default_artist = NULL;
-       }
-}
-
 char *_mp_album_list_recently_added_text_get(void *data, Evas_Object * obj, const char *part)
 {
        mp_media_list_h svc_handle = (mp_media_list_h) data;
@@ -1115,8 +978,6 @@ Evas_Object *_mp_album_list_recently_added_content_get(void *data, Evas_Object *
                                        "default");
                        elm_layout_content_set(content, "elm.swallow.content", image);
                        evas_object_data_set(content, "genlist_obj", list->genlist);
-                       elm_object_signal_callback_add(content, "mouse,clicked,1", "*",
-                                       _mp_album_list_recently_added_thumbpath_clicked_cb, item_data);
                        if (default_thumb_path) {
                                free(default_thumb_path);
                                default_thumb_path = NULL;
index e1b4b052fe6132f0144c0f1508da8eec8678d93e..4c9f57005240b172eae91b0345ed44964a50bef1 100755 (executable)
@@ -25,6 +25,7 @@
 #include "mp-play.h"
 #include "mp-minicontroller.h"
 #include "mp-common.h"
+#include <media_content.h>
 
 #define MP_LIST_DEFAULT_ICON_SIZE 28
 
@@ -99,11 +100,18 @@ static char *_mp_artist_detail_list_album_label_get(void *data,
 
        if (!g_strcmp0(part, "elm.text")) {
                ret = mp_media_info_group_get_main_info(svc_item, &name);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
+                       IF_FREE(name);
                        name = GET_SYS_STR("IDS_COM_BODY_UNKNOWN");
+                       return g_strdup(elm_entry_utf8_to_markup(name));
                }
-               return g_strdup(elm_entry_utf8_to_markup(name));
+               char *label = g_strdup(elm_entry_utf8_to_markup(name));
+               IF_FREE(name);
+               return label;
        }
        DEBUG_TRACE("Unusing part: %s", part);
        return NULL;
@@ -596,9 +604,10 @@ static char *_mp_artist_detail_list_shuffle_text_get(Evas_Object * obj)
        char **album_thumbs = NULL;
        int album_count = 0;
        int song_count = 0;
+       if (list && list->type_str) {
        res = mp_media_info_list_count(MP_TRACK_BY_ARTIST, list->type_str,
                                                                         NULL, NULL, 0, &song_count);
-   
+       }
        album_count = elm_genlist_items_count(obj) - song_count;
        char *sub_text = NULL;
        if (album_count == 1 && song_count == 1) {
@@ -678,7 +687,7 @@ _mp_artist_detail_list_shuffle_cb(void *data, Evas_Object * o,
 
        mp_play_control_shuffle_set(NULL, true);
        mp_common_play_track_list(item, obj);
-  SAFE_FREE(item);
+       SAFE_FREE(item);
        return;
 }
 
@@ -691,9 +700,10 @@ void mp_artist_detail_list_update_genlist(void *thiz)
        MP_CHECK(list->genlist);
 
        int count = 0;
+       if (list && list->type_str) {
        mp_media_info_list_count(MP_TRACK_BY_ARTIST, list->type_str, NULL,
                                                         NULL, 0, &count);
-
+       }
        if (count <= 0) {
                mp_list_update(thiz);
        } else {
@@ -805,6 +815,9 @@ static void _mp_artist_detail_list_load_list(void *thiz, int count)
                item_data =
                        mp_list_item_data_create
                        (MP_LIST_ITEM_TYPE_SELECTABLE_GROUP_TITLE);
+               if (!item_data)
+                       IF_FREE(title);
+
                MP_CHECK(item_data);
                item_data->handle = item;
                item_data->group_type = list->group_type;
@@ -837,6 +850,7 @@ static void _mp_artist_detail_list_load_list(void *thiz, int count)
                        }
                }
                _mp_artist_detail_list_shuffle_text_get(list->genlist);
+               IF_FREE(title);
        }
        elm_object_text_set(list->album_track_count_label, _mp_artist_detail_list_shuffle_text_get(list->genlist));
   END:
index 4b4e90fec3a81c8d0b6c43ce70ecc7c7c25653b4..46391bf975c82a58481d37b1ea27d8377d23a0c8 100755 (executable)
@@ -25,6 +25,7 @@
 #include "mp-widget.h"
 #include "mp-common.h"
 #include "mp-play.h"
+#include <media_content.h>
 
 #define ARTIST_GRID_W 175
 #define ARTIST_GRID_H 222
@@ -156,11 +157,18 @@ static char *_mp_artist_list_label_get(void *data, Evas_Object * obj,
 
        if (!strcmp(part, "elm.text")) {
                ret = mp_media_info_group_get_main_info(svc_item, &name);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
+                       IF_FREE(name);
                        name = GET_SYS_STR("IDS_COM_BODY_UNKNOWN");
+                       return elm_entry_utf8_to_markup(name);
                }
-               return elm_entry_utf8_to_markup(name);
+               char *label = elm_entry_utf8_to_markup(name);
+               IF_FREE(name);
+               return label;
        } else if (!strcmp(part, "elm.text.sub")) {
                char **album_thumbs = NULL;
                int album_count = 0;
@@ -196,9 +204,6 @@ static Evas_Object *_mp_artist_list_album_icon_get(Evas_Object * obj,
        MP_CHECK_NULL(item);
        MP_CHECK_NULL(item->handle);
 
-       char *artist_name = NULL;
-       mp_media_info_group_get_main_info(item->handle, &artist_name);
-
        char **album_thumbs = NULL;
        int album_count = 0;
        int song_count = 0;
@@ -348,15 +353,24 @@ _mp_artist_select_cb(void *data, Evas_Object * obj, void *event_info)
                ret = mp_media_info_group_get_main_info(gli_data->handle, &name);
                mp_media_info_group_get_thumbnail_path(gli_data->handle,
                                &thumbnail);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retm_if(ret != 0, "Fail to get value");
                mp_retm_if(name == NULL, "Fail to get value");
        }
 
        if (list->function_type == MP_LIST_FUNC_ADD_TRACK) {
                MpViewMgr_t *view_manager = mp_view_mgr_get_view_manager();
+               if (!view_manager)
+                       IF_FREE(name);
+
                MP_CHECK(view_manager);
                MpSelectTrackView_t *view_select_track =
                                mp_select_track_view_create(view_manager->navi);
+               if (!view_select_track)
+                       IF_FREE(name);
+
                MP_CHECK(view_select_track);
                mp_view_mgr_push_view(view_manager, (MpView_t *) view_select_track,
                                NULL);
@@ -397,6 +411,7 @@ _mp_artist_select_cb(void *data, Evas_Object * obj, void *event_info)
                elm_object_part_content_set(((MpListView_t *)view_select_track)->layout, "edit_list_content", view_select_track->content_to_show->layout);
                elm_object_signal_emit(view_select_track->content_to_show->layout, "control_hide_signal", "control_hide_source");
                elm_object_signal_emit(view_select_track->content_to_show->layout, "full_signal", "full_source");
+               IF_FREE(name);
                return;
        }
 
@@ -407,19 +422,27 @@ _mp_artist_select_cb(void *data, Evas_Object * obj, void *event_info)
                MpView_t *view = mp_view_mgr_get_top_view(view_mgr);
                ERROR_TRACE("update options of edit view");
                mp_view_update_options_edit((MpView_t *) view);
+               IF_FREE(name);
                return;
        }
 
        /* create the view of artist detail */
        MpViewMgr_t *view_manager = mp_view_mgr_get_view_manager();
+       if (!view_manager)
+               IF_FREE(name);
+
        MP_CHECK(view_manager);
        MpArtistDetailView_t *view_artist_detail =
                        mp_artist_detail_view_create(view_manager->navi, name, thumbnail);
+       if (!view_artist_detail)
+               IF_FREE(name);
+
        MP_CHECK(view_artist_detail);
        mp_view_mgr_push_view(view_manager, (MpView_t *) view_artist_detail,
                        NULL);
        mp_view_update_options((MpView_t *) view_artist_detail);
        mp_view_set_title((MpView_t *) view_artist_detail, name);
+       IF_FREE(name);
 }
 
 static void _mp_artist_list_append_group_index_item(void *thiz)
@@ -513,6 +536,9 @@ static void _mp_artist_list_load_list(void *thiz, int count)
 
                mp_list_item_data_t *item_data;
                item_data = calloc(1, sizeof(mp_list_item_data_t));
+               if (!item_data)
+                       IF_FREE(title);
+
                MP_CHECK(item_data);
                item_data->handle = item;
                item_data->group_type = list->group_type;
@@ -537,6 +563,7 @@ static void _mp_artist_list_load_list(void *thiz, int count)
                }
 
                item_data->it = list_item;
+               IF_FREE(title);
        }
 
        END:
@@ -968,15 +995,24 @@ static void _mp_artist_list_recently_added_thumbpath_clicked_cb(void *data,
                ret = mp_media_info_group_get_main_info(track, &name);
                mp_media_info_group_get_thumbnail_path(track,
                                                                                           &thumbnail);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retm_if(ret != 0, "Fail to get value");
                mp_retm_if(name == NULL, "Fail to get value");
        }
 
        if (list->function_type == MP_LIST_FUNC_ADD_TRACK) {
                MpViewMgr_t *view_manager = mp_view_mgr_get_view_manager();
+               if (!view_manager)
+                       IF_FREE(name);
+
                MP_CHECK(view_manager);
                MpSelectTrackView_t *view_select_track =
                        mp_select_track_view_create(view_manager->navi);
+               if (!view_select_track)
+                       IF_FREE(name);
+
                MP_CHECK(view_select_track);
                mp_view_mgr_push_view(view_manager, (MpView_t *) view_select_track,
                                                          NULL);
@@ -1002,6 +1038,7 @@ static void _mp_artist_list_recently_added_thumbpath_clicked_cb(void *data,
                mp_list_update(view_select_track->content_to_show);
                mp_view_update_options((MpView_t *) view_select_track);
                mp_list_set_edit(view_select_track->content_to_show, TRUE);
+               IF_FREE(name);
                return;
        }
 
@@ -1012,19 +1049,27 @@ static void _mp_artist_list_recently_added_thumbpath_clicked_cb(void *data,
                MpView_t *view = mp_view_mgr_get_top_view(view_mgr);
                ERROR_TRACE("update options of edit view");
                mp_view_update_options_edit((MpView_t *) view);
+               IF_FREE(name);
                return;
        }
 
        /* create the view of artist detail */
        MpViewMgr_t *view_manager = mp_view_mgr_get_view_manager();
+       if (!view_manager)
+               IF_FREE(name);
+
        MP_CHECK(view_manager);
        MpArtistDetailView_t *view_artist_detail =
                mp_artist_detail_view_create(view_manager->navi, name, thumbnail);
+       if (!view_artist_detail)
+               IF_FREE(name);
+
        MP_CHECK(view_artist_detail);
        mp_view_mgr_push_view(view_manager, (MpView_t *) view_artist_detail,
                                                  NULL);
        mp_view_update_options((MpView_t *) view_artist_detail);
        mp_view_set_title((MpView_t *) view_artist_detail, name);
+       IF_FREE(name);
 }
 
 static char *_mp_artist_list_recently_added_text_get(void *data, Evas_Object * obj, const char *part)
index ac97f839a2957b95c3bac4f770bdaf6c8175fea3..aeefa07365dcddfc139d140701ed178b58d78ac0 100755 (executable)
@@ -510,6 +510,7 @@ Evas_Object *_mp_edit_playlist_create_editfield(void *thiz)
 
                IF_FREE(mp_playlist_data->name);
                mp_playlist_data->name = g_strdup(name);
+               IF_FREE(name);
                if (mp_playlist_data->name) {
                        char *text = elm_entry_utf8_to_markup(mp_playlist_data->name);
                        elm_entry_entry_set(entry, text);
index a89c5cb2447642ea3b7a3a9e355b6dde81b3c398..e3df9e8ccc8ecc775e5710cd69bca8935af02a8d 100755 (executable)
@@ -15,7 +15,7 @@
  */
 
 #include <stdio.h>
-
+#include <media_content.h>
 #include "mp-genre-list.h"
 #include "mp-track-list.h"
 #include "mp-genre-detail-view.h"
@@ -52,34 +52,29 @@ static char *_mp_genre_list_label_get(void *data, Evas_Object * obj,
                || !strcmp(part, "elm.slide.text.1")
                || !strcmp(part, "elm.text")) {
                ret = mp_media_info_group_get_main_info(svc_item, &name);
+               if (ret != MEDIA_CONTENT_ERROR_NONE) {
+                       IF_FREE(name);
+               }
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
+                       IF_FREE(name);
                        name = GET_SYS_STR("IDS_COM_BODY_UNKNOWN");
+                       if (!strcmp(part, "elm.text.1")) {
+                               return elm_entry_utf8_to_markup(name);
+                       } else {
+                               return g_strdup(name);
+                       }
                }
-
+               char *label = NULL;
                if (!strcmp(part, "elm.text.1")) {
-                       return elm_entry_utf8_to_markup(name);
+                       label = elm_entry_utf8_to_markup(name);
                } else {
-                       return g_strdup(name);
+                       label = g_strdup(name);
                }
-
+               IF_FREE(name);
+               return label;
        }
-       /*
-          else if (!strcmp(part, "elm.text.2"))
-          {
-          int count = 0;
-          char *sub_text = NULL;
-          mp_media_info_group_get_track_count(svc_item, &count);
-
-          if (count == 1)
-          sub_text = g_strdup(GET_STR(STR_MP_1_SONG));
-          else
-          sub_text = g_strdup_printf(GET_STR(STR_MP_PD_SONGS), count);
-
-          return sub_text;
-          } */
-
-       /*DEBUG_TRACE("Unusing part: %s", part); */
+
        return NULL;
 }
 
@@ -189,6 +184,9 @@ _mp_genre_select_cb(void *data, Evas_Object * obj, void *event_info)
                mp_media_info_group_get_thumbnail_path(gli_data->handle,
                                                                                           &thumbnail);
                DEBUG_TRACE("thumbnail=%s", thumbnail);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retm_if(ret != 0, "Fail to get value");
                mp_retm_if(name == NULL, "Fail to get value");
 
@@ -198,9 +196,15 @@ _mp_genre_select_cb(void *data, Evas_Object * obj, void *event_info)
 
        if (list->function_type == MP_LIST_FUNC_ADD_TRACK) {
                MpViewMgr_t *view_manager = mp_view_mgr_get_view_manager();
+               if (!view_manager)
+                       IF_FREE(name);
+
                MP_CHECK(view_manager);
                MpSelectTrackView_t *view_select_track =
                        mp_select_track_view_create(view_manager->navi);
+               if (!view_select_track)
+                       IF_FREE(name);
+
                MP_CHECK(view_select_track);
                mp_view_mgr_push_view(view_manager, (MpView_t *) view_select_track,
                                                          NULL);
@@ -225,6 +229,7 @@ _mp_genre_select_cb(void *data, Evas_Object * obj, void *event_info)
                MpViewMgr_t *view_mgr = mp_view_mgr_get_view_manager();
                MpView_t *view = mp_view_mgr_get_top_view(view_mgr);
                mp_view_update_options_edit(view);
+               IF_FREE(name);
                return;
        }
 
@@ -238,7 +243,7 @@ _mp_genre_select_cb(void *data, Evas_Object * obj, void *event_info)
 
        mp_view_update_options((MpView_t *) view_genre_detail);
        mp_view_set_title((MpView_t *) view_genre_detail, title);
-
+       IF_FREE(name);
 }
 
 void _mp_genre_list_load_list(void *thiz, int count)
@@ -290,6 +295,9 @@ void _mp_genre_list_load_list(void *thiz, int count)
 
                mp_list_item_data_t *item_data;
                item_data = calloc(1, sizeof(mp_list_item_data_t));
+               if (!item_data)
+                       IF_FREE(title);
+
                MP_CHECK(item_data);
                item_data->handle = item;
                item_data->index = index;
@@ -313,6 +321,7 @@ void _mp_genre_list_load_list(void *thiz, int count)
                }
                item_data->it = list_item;
                elm_object_item_data_set(item_data->it, item_data);
+               IF_FREE(title);
        }
 
   END:
@@ -412,9 +421,13 @@ _mp_genre_list_item_longpressed_cb(void *data, Evas_Object * obj,
        popup =
                mp_genlist_popup_create(obj, MP_POPUP_LIST_LONGPRESSED,
                                                                &pop_item_count, ad);
+       if (!popup)
+               IF_FREE(title);
+
        MP_CHECK(popup);
 
        char *up_title = g_strdup(title);
+       IF_FREE(title);
 
        elm_object_part_text_set(popup, "title,text", up_title);
        IF_FREE(up_title);
index 3e343d3ff9680f8f9324229ba17a0aa4a3fba759..111a4d3634b879d8e9a61db6849f5df3b5676539 100755 (executable)
@@ -596,14 +596,16 @@ void mp_now_playing_list_refresh(MpNowPlayingList_t * list)
                        mp_plst_item *plst_item = item_data->plst_item;
                        if (plst_item && plst_item->uri
                                && plst_item->track_type == MP_TRACK_URI) {
+                               char *mmc_path = MP_MMC_ROOT_PATH;
                                if (!mp_file_exists(plst_item->uri)
-                                       || (mmc_removed
+                                       || (mmc_path && mmc_removed
                                                && strstr(plst_item->uri,
-                                                                 MP_MMC_ROOT_PATH) == plst_item->uri)) {
+                                                                 mmc_path) == plst_item->uri)) {
                                        WARN_TRACE("removed uri %s", plst_item->uri);
                                        elm_object_item_del(it);
                                        itemDeleted = true;
                                }
+                               IF_FREE(mmc_path);
                        }
                }
 
index 64801f66754bd10ab5fc6110c6791cf8d379620d..5371c7154cf083157e9b08f9b406519a92609da2 100755 (executable)
@@ -308,7 +308,8 @@ static void _mp_now_playing_update_btn(Evas_Object * obj)
        } else {
                snprintf(buffer, 1024, "%s%s%s", spath, "images/", "play.png");
        }
-       elm_image_file_set(wd->image, buffer, NULL);
+       if (wd && wd->image)
+               elm_image_file_set(wd->image, buffer, NULL);
 }
 
 static Eina_Bool _btn_update_timer(void *data)
@@ -645,11 +646,14 @@ static void _mp_now_playing_btn_pressed_cb(void *data, Evas_Object * obj,
        char *source = td->operation;
        if (!g_strcmp0(source, NOW_PLAYING_FF_SOURCE)) {
                snprintf(buffer, 1024, "%s%s%s", spath, "images/", "next_press.png");
-               elm_image_file_set(wd->next_image, buffer, NULL);
+               if (wd && wd->next_image)
+                       elm_image_file_set(wd->next_image, buffer, NULL);
+
                mp_play_control_ff(true, false, true);
        } else {
                snprintf(buffer, 1024, "%s%s%s", spath, "images/", "prev_press.png");
-               elm_image_file_set(wd->prev_image, buffer, NULL);
+               if (wd && wd->prev_image)
+                       elm_image_file_set(wd->prev_image, buffer, NULL);
                mp_play_control_rew(true, false, true);
        }
 }
@@ -661,6 +665,11 @@ static void _mp_now_playing_btn_unpressed_cb(void *data, Evas_Object * obj,
 
        MpTempData_t *td = (MpTempData_t *) data;
        MpNpData_t *wd = GET_WIDGET_DATA(td->grid_layout);
+       if(wd == NULL)
+       {
+               ERROR_TRACE("Failed to get widget data");
+               return;
+       }
 
        char buffer[1024] = {0,};
        const char *spath  = app_get_resource_path();
@@ -669,11 +678,15 @@ static void _mp_now_playing_btn_unpressed_cb(void *data, Evas_Object * obj,
 
        if (!g_strcmp0(source, NOW_PLAYING_FF_SOURCE)) {
                snprintf(buffer, 1024, "%s%s%s", spath, "images/", "next.png");
-               elm_image_file_set(wd->next_image, buffer, NULL);
+               if (wd && wd->next_image)
+                       elm_image_file_set(wd->next_image, buffer, NULL);
+
                mp_play_control_ff(false, false, true);
        } else {
                snprintf(buffer, 1024, "%s%s%s", spath, "images/", "prev.png");
-               elm_image_file_set(wd->prev_image, buffer, NULL);
+               if (wd && wd->prev_image)
+                       elm_image_file_set(wd->prev_image, buffer, NULL);
+
                mp_play_control_rew(false, false, true);
        }
 }
@@ -995,7 +1008,8 @@ void mp_now_playing_update(Evas_Object * now_playing, const char *title,
        struct appdata *ad = mp_util_get_appdata();
        MP_CHECK(ad);
 
-       elm_image_file_set(wd->thumbnail, thumbnail, NULL);
+       if (wd && wd->thumbnail)
+               elm_image_file_set(wd->thumbnail, thumbnail, NULL);
        if (with_title) {
                _mp_now_playing_set_title(now_playing, title, artist);
        }
index 8f5a93b120f64b8e9578d6476d26246d9abc73e0..189f4be25d88f70ebdc9c6824aaaddb43c4953c2 100755 (executable)
@@ -29,6 +29,7 @@
 #include "mp-edit-playlist.h"
 #include "ms-key-ctrl.h"
 #include "mp-all-view.h"
+#include <media_content.h>
 
 #define ALBUM_GRID_W 233
 #define ALBUM_GRID_H 319
@@ -75,6 +76,9 @@ static char *_mp_playlist_list_label_get(void *data, Evas_Object * obj,
 
                char *name = NULL;
                ret = mp_media_info_group_get_main_info(plst_item, &name);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retvm_if(ret != 0, NULL, "Fail to get value");
                mp_retvm_if(name == NULL, NULL, "Fail to get value");
 
@@ -544,12 +548,16 @@ _mp_playlist_user_playlist_select_cb(void *data, Evas_Object * obj,
        mp_retm_if(ret != 0, "Fail to get value");
 
        ret = mp_media_info_group_get_main_info(item_data->handle, &name);
+       if (ret != MEDIA_CONTENT_ERROR_NONE)
+               IF_FREE(name);
+
        mp_retm_if(ret != 0, "Fail to get value");
        mp_retm_if(name == NULL, "Fail to get value");
 
 
        if (list->function_type == MP_LIST_FUNC_ADD_TRACK) {
                MpViewMgr_t *view_manager = mp_view_mgr_get_view_manager();
+               IF_FREE(name);
                MP_CHECK(view_manager);
                MpSelectTrackView_t *view_select_track =
                        mp_select_track_view_create(view_manager->navi);
@@ -581,21 +589,28 @@ _mp_playlist_user_playlist_select_cb(void *data, Evas_Object * obj,
                ERROR_TRACE("update options of edit view");
                mp_view_update_options_edit(view);
                ERROR_TRACE("set selected count");
+               IF_FREE(name);
                return;
        }
 
        MpViewMgr_t *view_manager = mp_view_mgr_get_view_manager();
+       if (!view_manager)
+               IF_FREE(name);
+
        MP_CHECK(view_manager);
        MpPlaylistDetailView_t *view_plst_detail =
                mp_playlist_detail_view_create(view_manager->navi,
                                                                           MP_TRACK_BY_PLAYLIST, name, p_id);
+       if (!view_plst_detail)
+               IF_FREE(name);
+
        MP_CHECK(view_plst_detail);
        mp_view_mgr_push_view(view_manager, (MpView_t *) view_plst_detail,
                                                  NULL);
 
        mp_view_update_options((MpView_t *) view_plst_detail);
        mp_view_set_title((MpView_t *) view_plst_detail, name);
-
+       IF_FREE(name);
 }
 
 static void
@@ -690,6 +705,9 @@ _mp_playlist_auto_playlist_select_cb(void *data, Evas_Object * obj,
        item_data = elm_object_item_data_get(gli);
        MP_CHECK(item_data);
        ret = mp_media_info_group_get_main_info(item_data->handle, &name);
+       if (ret != MEDIA_CONTENT_ERROR_NONE)
+               IF_FREE(name);
+
        mp_retm_if(ret != 0, "Fail to get value");
        mp_retm_if(name == NULL, "Fail to get value");
 
@@ -804,7 +822,6 @@ _mp_playlist_append_user_playlists(void *thiz,
 
        for (index = 0; index < count; index++) {
                mp_media_info_h item = NULL;
-               char *title = NULL;
 
                item =
                        mp_media_info_group_list_nth_item(plst->playlists_user, index);
@@ -814,9 +831,10 @@ _mp_playlist_append_user_playlists(void *thiz,
                                 ret, index);
                        goto END;
                }
-               mp_media_info_group_get_main_info(item, &title);
+
                mp_list_item_data_t *item_data;
                item_data = calloc(1, sizeof(mp_list_item_data_t));
+
                MP_CHECK(item_data);
                item_data->handle = item;
                item_data->group_type = plst->group_type;
@@ -1450,4 +1468,4 @@ void mp_playlist_list_copy_data(MpPlaylistList_t * src,
        SAFE_FREE(dest->filter_str);
        dest->filter_str = g_strdup(src->filter_str);
        dest->display_mode = src->display_mode;
-}
\ No newline at end of file
+}
index c3260a37a386e0630e21bc2adf40c98481dca1d2..5c2be86a86b5f0bae659f67cc0439ced499858aa 100755 (executable)
@@ -25,6 +25,7 @@
 #include "mp-album-detail-view.h"
 #include "mp-play.h"
 #include "mp-common.h"
+#include <media_content.h>
 
 #define MP_LIST_DEFAULT_ICON_SIZE 28
 
@@ -275,23 +276,39 @@ static char *_mp_search_album_list_label_get(void *data, Evas_Object * obj,
 
        if (!strcmp(part, "elm.text")) {
                ret = mp_media_info_group_get_main_info(svc_item, &name);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
+                       IF_FREE(name);
                        name = GET_SYS_STR("IDS_COM_BODY_UNKNOWN");
+                       if (!strcmp(part, "elm.text")) {
+                               bool res = false;
+                               char *markup_name =
+                                       (char *) mp_util_search_markup_keyword(name,
+                                                                                                          list->filter_str,
+                                                                                                          &res);
+                               return (res) ? g_strdup(markup_name) :
+                                       elm_entry_utf8_to_markup(name);
+                       } else {
+                               return g_strdup(name);
+                       }
                }
-
+               char *label = NULL;
                if (!strcmp(part, "elm.text")) {
                        bool res = false;
                        char *markup_name =
                                (char *) mp_util_search_markup_keyword(name,
                                                                                                           list->filter_str,
                                                                                                           &res);
-                       return (res) ? g_strdup(markup_name) :
+                       label = (res) ? g_strdup(markup_name) :
                                elm_entry_utf8_to_markup(name);
                } else {
-                       return g_strdup(name);
+                       label = g_strdup(name);
                }
-
+               IF_FREE(name);
+               return label;
        } else if (!strcmp(part, "elm.text.sub")) {
                ret = mp_media_info_group_get_sub_info(svc_item, &name);
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
@@ -367,6 +384,9 @@ _mp_search_album_select_cb(void *data, Evas_Object * obj, void *event_info)
                mp_media_info_group_get_thumbnail_path(gli_data->handle,
                                                                                           &thumbnail);
                DEBUG_TRACE("thumbnail=%s", thumbnail);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retm_if(ret != 0, "Fail to get value");
                mp_retm_if(name == NULL, "Fail to get value");
 
@@ -404,21 +424,39 @@ static char *_mp_search_artist_list_label_get(void *data,
 
        if (!strcmp(part, "elm.text")) {
                ret = mp_media_info_group_get_main_info(svc_item, &name);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
+                       IF_FREE(name);
                        name = GET_SYS_STR("IDS_COM_BODY_UNKNOWN");
+                       if (!strcmp(part, "elm.text")) {
+                               bool res = false;
+                               char *markup_name =
+                                       (char *) mp_util_search_markup_keyword(name,
+                                                                                                          list->filter_str,
+                                                                                                          &res);
+                               return (res) ? g_strdup(markup_name) :
+                                       elm_entry_utf8_to_markup(name);
+                       } else {
+                               return g_strdup(name);
+                       }
                }
+               char *label = NULL;
                if (!strcmp(part, "elm.text")) {
                        bool res = false;
                        char *markup_name =
                                (char *) mp_util_search_markup_keyword(name,
                                                                                                           list->filter_str,
                                                                                                           &res);
-                       return (res) ? g_strdup(markup_name) :
+                       label = (res) ? g_strdup(markup_name) :
                                elm_entry_utf8_to_markup(name);
                } else {
-                       return g_strdup(name);
+                       label = g_strdup(name);
                }
+               IF_FREE(name);
+               return label;
        }
        return NULL;
 }
@@ -478,6 +516,9 @@ _mp_search_artist_select_cb(void *data, Evas_Object * obj,
                mp_media_info_group_get_thumbnail_path(gli_data->handle,
                                                                                           &thumbnail);
                DEBUG_TRACE("thumbnail=%s", thumbnail);
+               if (ret != MEDIA_CONTENT_ERROR_NONE)
+                       IF_FREE(name);
+
                mp_retm_if(ret != 0, "Fail to get value");
                mp_retm_if(name == NULL, "Fail to get value");