Fixed Build Warnings

Change-Id: I8a15f279f49993d38ab11d38e497533475e277ff
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>

diff --git a/music-chooser/src/include/music-chooser.h b/music-chooser/src/include/music-chooser.h
index 23a5684..399858f 100644 (file)
--- a/music-chooser/src/include/music-chooser.h
+++ b/music-chooser/src/include/music-chooser.h
@@ -40,13 +40,20 @@
 #define SYS_DOMAIN_NAME "sys_string"
 #define MC_EDJ_FILE            "music-chooser.edj"
 
-#define _EDJ(o)                        elm_layout_edje_get(o)
+#define _EDJ(o)                                elm_layout_edje_get(o)
+
+#ifdef GET_STR
+#undef GET_STR
+#endif
+
+#ifdef GET_SYS_STR
+#undef GET_SYS_STR
+#endif
+
 #define GET_STR(s)                     dgettext(DOMAIN_NAME, s)
 #define dgettext_noop(s)       (s)
-#define N_(s)                  dgettext_noop(s)
-#define GET_SYS_STR(str) dgettext(DOMAIN_NAME, str)
-
-#define IF_FREE(p) ({if(p){free(p);p=NULL;}})
+#define N_(s)                          dgettext_noop(s)
+#define GET_SYS_STR(str)       dgettext(DOMAIN_NAME, str)
 
 #define MC_SELECT_MODE_KEY     "http://tizen.org/appcontrol/data/selection_mode"
 #define MC_SELECT_MULTIPLE     "multiple"

diff --git a/music-chooser/src/mc-common.c b/music-chooser/src/mc-common.c
index f7def55..a914c10 100644 (file)
--- a/music-chooser/src/mc-common.c
+++ b/music-chooser/src/mc-common.c
@@ -29,7 +29,7 @@
 #define MC_FILE_PREFIX "file://"
 
 bool detail_view = false;
-static external_mmc_id = -1;
+static int external_mmc_id = -1;
 
 static Eina_Bool
 _back_cb(void *data, Elm_Object_Item *it)

diff --git a/music-chooser/src/mc-group-list.c b/music-chooser/src/mc-group-list.c
index 2dda946..90bf586 100644 (file)
--- a/music-chooser/src/mc-group-list.c
+++ b/music-chooser/src/mc-group-list.c
@@ -119,20 +119,12 @@ _layout_del_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
        free(ld);
 }
 
-static void _mc_group_list_gl_del(void *data, Evas_Object *obj)
-{
-       list_item_data_t *it_data = data;
-       IF_FREE(it_data);
-}
-
-
 static void
 _mc_itc_init(int type, group_list_data_t *ld)
 {
        MP_CHECK(ld);
 
        ld->itc.func.content_get = mc_group_content_get;
-       //ld->itc.func.del = _mc_group_list_gl_del;
        switch (type) {
        case MP_GROUP_BY_ALBUM:
                ld->itc.item_style = "type1";

diff --git a/music-chooser/src/mc-track-list.c b/music-chooser/src/mc-track-list.c
index 73afd2b..bc2a09d 100644 (file)
--- a/music-chooser/src/mc-track-list.c
+++ b/music-chooser/src/mc-track-list.c
@@ -161,7 +161,6 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa
        char *cur_uri = NULL;
        Evas_Object *content = NULL;
        Evas_Object *icon = NULL;
-       Evas_Object *check = NULL;
        Evas_Object *prev_part_content;
        Evas_Object *part_content;
 

diff --git a/src/common/mp-media-info.c b/src/common/mp-media-info.c
index 8ff06e5..559661e 100644 (file)
--- a/src/common/mp-media-info.c
+++ b/src/common/mp-media-info.c
@@ -677,7 +677,7 @@ 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, collation);
+       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);
        }
@@ -686,7 +686,7 @@ 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, collation);
+       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);
        }

diff --git a/src/common/mp-ug-launch.c b/src/common/mp-ug-launch.c
index f40be0c..259057c 100644 (file)
--- a/src/common/mp-ug-launch.c
+++ b/src/common/mp-ug-launch.c
@@ -426,37 +426,3 @@ END:
 
        return result;
 }
-
-static bool
-_mp_ug_launch_as_appcontrol(const char *ug_name)
-{
-       MP_CHECK_FALSE(ug_name);
-
-       bool result = false;
-
-       app_control_h service = NULL;
-       int ret = app_control_create(&service);
-       if (ret != APP_CONTROL_ERROR_NONE) {
-               mp_error("app_control_create()... [0x%x]", ret);
-               goto END;
-       }
-
-       ret = app_control_set_app_id(service, ug_name);
-       if (ret != APP_CONTROL_ERROR_NONE) {
-               mp_error("app_control_set_app_id()... [0x%x]", ret);
-               goto END;
-       }
-
-       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);
-               goto END;
-       }
-       result = true;
-END:
-       if (service) {
-               app_control_destroy(service);
-               service = NULL;
-       }
-       return result;
-}

diff --git a/src/include/mp-player-debug.h b/src/include/mp-player-debug.h
index 53acd02..b94d23a 100644 (file)
--- a/src/include/mp-player-debug.h
+++ b/src/include/mp-player-debug.h
@@ -57,6 +57,11 @@
 #define ERROR_TRACE(fmt, arg...)       dlog_print(DLOG_ERROR, LOG_TAG, "[%s : %05d %lu]" fmt "\n", __func__, __LINE__, gettid(), ##arg)
 #define mp_debug_temp(fmt, arg...)
 #define TIMER_TRACE(fmt, arg...)       do { if (mp_file_exists("/tmp/mp_show_timer_log")) dlog_print(DLOG_DEBUG, LOG_TAG, "[%s : %05d %lu]" fmt "\n", __func__, __LINE__, gettid(), ##arg); } while (0)
+
+#ifdef PARAM_CHECK
+#undef PARAM_CHECK
+#endif
+
 #define PARAM_CHECK(fmt, arg...)       dlog_print(DLOG_DEBUG, LOG_TAG, "[%s : %05d %lu]" fmt "\n", __func__, __LINE__, gettid(), ##arg)
 
 //#define PROFILE_IN(func)             LOG(LOG_DEBUG, "LAUNCH","[music-player:Application:"func":IN]"); TA(1, func);

diff --git a/src/widget/mp-album-list.c b/src/widget/mp-album-list.c
index a868bd8..2324be3 100644 (file)
--- a/src/widget/mp-album-list.c
+++ b/src/widget/mp-album-list.c
@@ -401,87 +401,6 @@ static mp_group_type_e _mp_album_list_get_group_type(void *thiz)
        return MP_GROUP_BY_ALBUM;
 }
 
-/*static void
-_mp_album_list_item_longpressed_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       startfunc;
-
-       MpAlbumList_t *list = (MpAlbumList_t *)data;
-       MP_CHECK(list);
-
-        if (list->edit_mode)
-        {
-               return ;
-        }
-
-       struct appdata *ad = mp_util_get_appdata();
-       MP_CHECK(ad);
-
-       Elm_Object_Item *item = event_info;
-       MP_CHECK(item);
-
-       int pop_item_count = 5;
-       char *title = NULL;
-       Evas_Object *popup = NULL;
-       mp_list_item_data_t *item_data = NULL;
-
-       if (list->scroll_drag_status)
-               return;
-
-       Elm_Object_Item *temp = NULL;
-       if (MP_LIST_OBJ_IS_GENGRID(list->genlist))
-       {
-               temp = elm_gengrid_first_item_get(list->genlist);
-               while (temp) {
-                       item_data = elm_object_item_data_get(temp);
-                       item_data->checked = false;
-                       temp = elm_gengrid_item_next_get(temp);
-               }
-       }
-       else
-       {
-               temp = elm_genlist_first_item_get(list->genlist);
-               while (temp) {
-                       item_data = elm_object_item_data_get(temp);
-                       item_data->checked = false;
-                       temp = elm_genlist_item_next_get(temp);
-               }
-       }
-
-       item_data = elm_object_item_data_get(item);
-       MP_CHECK(item_data);
-       item_data->checked = true;
-
-       pop_item_count = 4;
-       mp_media_info_group_get_main_info(item_data->handle, &title);
-
-       popup = mp_genlist_popup_create(obj, MP_POPUP_LIST_LONGPRESSED, &pop_item_count, ad);
-       MP_CHECK(popup);
-
-       char *up_title = g_strdup(title);
-
-       elm_object_part_text_set(popup, "title,text", up_title);
-       IF_FREE(up_title);
-
-       mp_genlist_popup_item_append(popup, STR_MP_PLAY_ALL, NULL, NULL, NULL,
-                       mp_common_playall_cb, list);
-
-       mp_genlist_popup_item_append(popup, STR_MP_ADD_TO_PLAYLIST, NULL, NULL, NULL,
-                       mp_common_list_add_to_playlist_cb, list);
-
-       mp_genlist_popup_item_append(popup, STR_MP_DELETE, NULL, NULL, NULL,
-                       mp_common_list_delete_cb, list);
-
-       if (MP_LIST_OBJ_IS_GENGRID(list->genlist))
-       {
-               MP_GENGRID_ITEM_LONG_PRESSED(obj, popup, event_info);
-       }
-       else
-       {
-               MP_GENLIST_ITEM_LONG_PRESSED(obj, popup, event_info);
-       }
-}*/
-
 static void
 _mp_album_list_genlist_create(MpAlbumList_t *list)
 {

diff --git a/src/widget/mp-artist-list.c b/src/widget/mp-artist-list.c
index 45e4631..4513184 100644 (file)
--- a/src/widget/mp-artist-list.c
+++ b/src/widget/mp-artist-list.c
@@ -462,81 +462,6 @@ _mp_artist_list_item_unhighlighted_cb(void *data, Evas_Object *obj, void *event_
        }
 }
 
-/*static void
-_mp_artist_list_item_longpressed_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       startfunc;
-
-       MpArtistList_t *list = (MpArtistList_t *)data;
-       MP_CHECK(list);
-
-       if (list->edit_mode) {
-               return ;
-       }
-
-       struct appdata *ad = mp_util_get_appdata();
-       MP_CHECK(ad);
-
-       Elm_Object_Item *item = event_info;
-       MP_CHECK(item);
-
-       int pop_item_count = 5;
-       char *title = NULL;
-       Evas_Object *popup = NULL;
-       mp_list_item_data_t *item_data = NULL;
-
-       if (list->scroll_drag_status)
-               return;
-
-       Elm_Object_Item *temp = NULL;
-       temp = elm_genlist_first_item_get(list->genlist);
-       if (MP_LIST_OBJ_IS_GENGRID(list->genlist)) {
-               temp = elm_gengrid_first_item_get(list->genlist);
-               while (temp) {
-                       item_data = elm_object_item_data_get(temp);
-                       item_data->checked = false;
-                       temp = elm_gengrid_item_next_get(temp);
-               }
-       } else {
-               temp = elm_genlist_first_item_get(list->genlist);
-               while (temp) {
-                       item_data = elm_object_item_data_get(temp);
-                       item_data->checked = false;
-                       temp = elm_genlist_item_next_get(temp);
-               }
-       }
-
-       item_data = elm_object_item_data_get(item);
-       MP_CHECK(item_data);
-       item_data->checked = true;
-
-       pop_item_count = 3;
-       mp_media_info_group_get_main_info(item_data->handle, &title);
-
-       popup = mp_genlist_popup_create(obj, MP_POPUP_LIST_LONGPRESSED, &pop_item_count, ad);
-       MP_CHECK(popup);
-
-       char *up_title = g_strdup(title);
-
-       elm_object_part_text_set(popup, "title,text", up_title);
-       IF_FREE(up_title);
-
-       mp_genlist_popup_item_append(popup, STR_MP_PLAY_ALL, NULL, NULL, NULL,
-               mp_common_playall_cb, list);
-       mp_genlist_popup_item_append(popup, STR_MP_ADD_TO_PLAYLIST, NULL, NULL, NULL,
-               mp_common_list_add_to_playlist_cb, list);
-
-       mp_genlist_popup_item_append(popup, STR_MP_DELETE, NULL, NULL, NULL,
-               mp_common_list_delete_cb, list);
-
-       if (MP_LIST_OBJ_IS_GENGRID(list->genlist)) {
-               MP_GENGRID_ITEM_LONG_PRESSED(obj, popup, event_info);
-       } else {
-               MP_GENLIST_ITEM_LONG_PRESSED(obj, popup, event_info);
-       }
-
-}*/
-
 static void
 _mp_artist_list_genlist_create(MpArtistList_t *list)
 {

diff --git a/src/widget/mp-genre-list.c b/src/widget/mp-genre-list.c
index d6c7477..5c69d90 100644 (file)
--- a/src/widget/mp-genre-list.c
+++ b/src/widget/mp-genre-list.c
@@ -488,7 +488,6 @@ _mp_genre_list_gengrid_create(MpGenreList_t *list)
                list->gengrid_itc->func.del = _mp_genre_list_item_del_cb;
        }
        _mp_genre_list_set_grid_style(list);
-       /*evas_object_smart_callback_add(list->genlist, "longpressed", _mp_genre_list_item_longpressed_cb, list);*/
 
        elm_gengrid_align_set(list->genlist, 0.5, 0.0);
        endfunc;