Resolved build warnings 90/65790/1
authorRahul Dadhich <r.dadhich@samsung.com>
Tue, 12 Apr 2016 12:20:47 +0000 (17:50 +0530)
committerRahul Dadhich <r.dadhich@samsung.com>
Tue, 12 Apr 2016 12:20:47 +0000 (17:50 +0530)
Change-Id: Id97810f0eccc47666b706a7c972f22d6a7b5ce8d
Signed-off-by: Rahul Dadhich <r.dadhich@samsung.com>
music-chooser/src/mc-group-play-list.c
src/core/mp-player-mgr.c
src/mp-main.c
src/view/mp-setting-view.c
src/widget/include/mp-index.h
src/widget/mp-index.c
src/widget/mp-minicontroller.c
widget/src/mp-widget-create.c

index 7e02b25bcbcb0377dc9ca123e11a71674d8121c5..7181200478be2d8fa70cbc56712dea5d944efc04 100644 (file)
@@ -328,7 +328,7 @@ int mc_group_play_list_update(Evas_Object *list, Elm_Object_Item *navi_it)
 
        char image_path[1024] = {0};
        char *path = app_get_resource_path();
-       MP_CHECK_NULL(path);
+       MP_CHECK_VAL(path, -1);
        snprintf(image_path, 1024, "%s%s/%s", path, "edje", IMAGE_EDJ_NAME);
        elm_image_file_set(ic, image_path, "00_icon_edit.png");
        free(path);
index eb6be44fcc98db797634ab3be3704ba19dfa3977..6d6263e227d041e787ee1911f5fcf3095b729fde 100755 (executable)
@@ -680,7 +680,6 @@ mp_player_mgr_destroy(void *data)
        struct appdata *ad = data;
        MP_CHECK_FALSE(ad);
        int res = true;
-       int error = -1;
        if (ad->current_track_info) {
                if (mp_setting_read_playing_status(ad->current_track_info->uri, "paused") != 1) {
                        mp_setting_write_playing_status(ad->current_track_info->uri, "paused");
@@ -875,6 +874,9 @@ mp_player_mgr_resume(void *data)
 
        if (ad->stream_info) {
                ret = sound_manager_get_focus_state(ad->stream_info, &state_for_playback, &state_for_recording);
+               if(ret != SOUND_MANAGER_ERROR_NONE) {
+                       ERROR_TRACE("failed in sound_manager_get_focus_state");
+               }
                if (state_for_playback != SOUND_STREAM_FOCUS_STATE_ACQUIRED) {
                        error = sound_manager_acquire_focus(ad->stream_info, SOUND_STREAM_FOCUS_FOR_PLAYBACK, NULL);
                        if (error != SOUND_MANAGER_ERROR_NONE) {
@@ -1151,7 +1153,10 @@ void mp_player_focus_callback(sound_stream_info_h stream_info, sound_stream_focu
        sound_stream_focus_state_e state_for_recording;
        int ret = -1;
        ret = sound_manager_get_focus_state(ad->stream_info, &state_for_playback,
-                                                                               &state_for_recording);
+                       &state_for_recording);
+       if(ret != SOUND_MANAGER_ERROR_NONE) {
+               ERROR_TRACE("failed in sound_manager_get_focus_state");
+       }
        if (state_for_playback == SOUND_STREAM_FOCUS_STATE_RELEASED) {
                mp_player_mgr_pause(ad);
 
index 8b6de7b5fb45f6f001532aede607f1cd866851dc..fbba55b94004e96d358584e58bed6eb80198d2bb 100755 (executable)
@@ -1371,7 +1371,7 @@ 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 *th = elm_theme_new();*/
        elm_theme_extension_add(NULL, edje_path);
        free(path);
        PROFILE_OUT("elm_theme_extension_add");
index 0cb7ed4b0dd8c63d16c334bb1030a3156ea176a7..4d10d6f58a703a6ac966c5bdaf49b1ee91294bd1 100755 (executable)
@@ -1019,6 +1019,7 @@ void mp_music_viewas_pop_cb(void)
        struct appdata *ad = mp_util_get_appdata();
        MP_CHECK(ad);
        Evas_Object *genlist = NULL;
+       int data = 0;
        Elm_Genlist_Item_Class *itc = NULL;
        /* elm_object_style_set(popup, "content/default"); */
        elm_popup_orient_set(popup, ELM_POPUP_ORIENT_CENTER);
@@ -1062,9 +1063,10 @@ void mp_music_viewas_pop_cb(void)
                itc->func.content_get = _lyrics_view_content_get;
                itc->func.del = NULL;
        }
-       elm_genlist_item_append(genlist, itc, 0, NULL,
+       elm_genlist_item_append(genlist, itc, &data, NULL,
                                ELM_GENLIST_ITEM_NONE, _lyrics_state_on_cb, (mp_setting_lyric_popup *)ly_popup);
-       elm_genlist_item_append(genlist, itc, 1, NULL,
+       data = 1;
+       elm_genlist_item_append(genlist, itc, &data, NULL,
                                ELM_GENLIST_ITEM_NONE, _lyrics_state_off_cb, (mp_setting_lyric_popup *)ly_popup);
 }
 
index 703a50de2cbdad48f82cd302ed40ca79bacfc7ae..f5c6d1378b8271803af89f3ab372e55abdd85841 100644 (file)
 
 typedef void (*MpIndexCb)(void *data);
 
-static char *non_latin_lan[] = {
-     "ar_AE.UTF-8",
-     "as_IN.UTF-8",
-     "bg_BG.UTF-8",
-     "bn_IN.UTF-8",
-     "el_GR.UTF-8",
-     "fa_IR.UTF-8",
-     "gu_IN.UTF-8",
-     "he_IL.UTF-8",
-     "hi_IN.UTF-8",
-     "hy_AM.UTF-8",
-     "ja_JP.UTF-8",
-     "ka_GE.UTF-8",
-     "kk_KZ.UTF-8",
-     "km_KH.UTF-8",
-     "kn_IN.UTF-8",
-     "ko_KR.UTF-8",
-     "lo_LA.UTF-8",
-     "mk_MK.UTF-8",
-     "ml_IN.UTF-8",
-     "mn_MN.UTF-8",
-     "mr_IN.UTF-8",
-     "ne_NP.UTF-8",
-     "or_IN.UTF-8",
-     "pa_IN.UTF-8",
-     "ru_RU.UTF-8",
-     "si_LK.UTF-8",
-     "ta_IN.UTF-8",
-     "te_IN.UTF-8",
-     "th_TH.UTF-8",
-     "uk_UA.UTF-8",
-     "ur_PK.UTF-8",
-     "zh_TW.UTF-8",
-     NULL
-};
 
 Evas_Object *mp_index_create(Evas_Object *parent, int group_type, void *data);
 void mp_index_append_item(Evas_Object *index, MpList_t *list);
index 524cdb3ddf852493d06b45784f8884a7bfe80617..78f2a77dd3550a20c18d32163768b1f865ad4618 100755 (executable)
@@ -25,6 +25,42 @@ typedef struct {
 
 } MpIndexData_t;
 
+static char *non_latin_lan[] = {
+     "ar_AE.UTF-8",
+     "as_IN.UTF-8",
+     "bg_BG.UTF-8",
+     "bn_IN.UTF-8",
+     "el_GR.UTF-8",
+     "fa_IR.UTF-8",
+     "gu_IN.UTF-8",
+     "he_IL.UTF-8",
+     "hi_IN.UTF-8",
+     "hy_AM.UTF-8",
+     "ja_JP.UTF-8",
+     "ka_GE.UTF-8",
+     "kk_KZ.UTF-8",
+     "km_KH.UTF-8",
+     "kn_IN.UTF-8",
+     "ko_KR.UTF-8",
+     "lo_LA.UTF-8",
+     "mk_MK.UTF-8",
+     "ml_IN.UTF-8",
+     "mn_MN.UTF-8",
+     "mr_IN.UTF-8",
+     "ne_NP.UTF-8",
+     "or_IN.UTF-8",
+     "pa_IN.UTF-8",
+     "ru_RU.UTF-8",
+     "si_LK.UTF-8",
+     "ta_IN.UTF-8",
+     "te_IN.UTF-8",
+     "th_TH.UTF-8",
+     "uk_UA.UTF-8",
+     "ur_PK.UTF-8",
+     "zh_TW.UTF-8",
+     NULL
+};
+
 #define GET_WIDGET_DATA(o) evas_object_data_get(o, "widget_d");
 
 static void
index f29ef5860d47f1a34c5bd72f7e8ce1e376162783..f87484777a841e604ebbf0891d8069dbb4fb5430 100755 (executable)
@@ -363,7 +363,8 @@ static void _quick_panel_cb(minicontrol_viewer_event_e event_type, bundle *event
 {
        startfunc;
        struct appdata *ad = mp_util_get_appdata();
-       if (event_type == MINICONTROL_EVENT_REQUEST_HIDE) {
+       minicontrol_viewer_event_e event_hide = (minicontrol_viewer_event_e)MINICONTROL_EVENT_REQUEST_HIDE;
+       if (event_type == event_hide) {
                DEBUG_TRACE("CLOSE");
                if (!mp_util_is_other_player_playing()) {
                        int ret_set = 0;
index 18ea1ace4af685fd0abfcd9f5386eaf0fe09997e..bb7b47881f53f2cc1ad8a8d3eec3d4e153ba272c 100644 (file)
@@ -353,9 +353,17 @@ static void mp_widget_read_ini_file(char *path, void *data)
        fclose(file);
 }
 
-static void mp_widget_music_player_result_callback(void *data)
+static void mp_widget_music_player_result_callback(app_control_h request, app_control_h reply, app_control_result_e result, void *user_data)
 {
-       if (!data) {
+       if (!user_data) {
+               return;
+       }
+}
+
+
+static void mp_widget_music_player_result(void *user_data)
+{
+       if (!user_data) {
                return;
        }
 }
@@ -474,7 +482,7 @@ static void mp_widget_click_on_add_tracks_cb(void *data, Evas_Object *obj,
 
        mp_widget_music_player_launch(layout, extra_data_keys,
                                      extra_data_values, extra_data_len, EINA_TRUE, NULL);
-       mp_widget_music_player_result_callback(layout);
+       mp_widget_music_player_result(layout);
 
        for (i = 0; i < extra_data_len; ++i) {
                free(extra_data_keys[i]);
@@ -521,7 +529,7 @@ static void mp_widget_click_on_track_image_cb(void *data, Evas_Object *obj,
 
        mp_widget_music_player_launch(layout, extra_data_keys,
                                      extra_data_values, extra_data_len, EINA_TRUE, wgtdata->file_path);
-       mp_widget_music_player_result_callback(layout);
+       mp_widget_music_player_result(layout);
 
        for (i = 0; i < extra_data_len; ++i) {
                free(extra_data_keys[i]);
@@ -635,7 +643,7 @@ static void mp_widget_click_on_play_cb(void *data, Evas_Object *obj,
        if (message_port_init(extra_data_values[0]) != MESSAGE_PORT_ERROR_NONE) {
                mp_widget_music_player_launch(layout, extra_data_keys,
                                              extra_data_values, extra_data_len, EINA_FALSE, wgtdata->file_path);
-               mp_widget_music_player_result_callback(layout);
+               mp_widget_music_player_result(layout);
        }
        for (i = 0; i < extra_data_len; ++i) {
                free(extra_data_keys[i]);
@@ -697,7 +705,7 @@ static void mp_widget_click_on_previous_cb(void *data, Evas_Object *obj,
        if (message_port_init(extra_data_values[0]) != MESSAGE_PORT_ERROR_NONE) {
                mp_widget_music_player_launch(layout, extra_data_keys,
                                              extra_data_values, extra_data_len, EINA_FALSE, wgtdata->file_path);
-               mp_widget_music_player_result_callback(layout);
+               mp_widget_music_player_result(layout);
        }
 
        for (i = 0; i < extra_data_len; ++i) {
@@ -760,7 +768,7 @@ static void mp_widget_click_on_next_cb(void *data, Evas_Object *obj,
        if (message_port_init(extra_data_values[0]) != MESSAGE_PORT_ERROR_NONE) {
                mp_widget_music_player_launch(layout, extra_data_keys,
                                              extra_data_values, extra_data_len, EINA_FALSE, wgtdata->file_path);
-               mp_widget_music_player_result_callback(layout);
+               mp_widget_music_player_result(layout);
        }
 
        for (i = 0; i < extra_data_len; ++i) {
@@ -772,7 +780,7 @@ static void mp_widget_click_on_next_cb(void *data, Evas_Object *obj,
        free(extra_data_values);
 }
 
-static void __mp_change_multiple_widgets(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, char *path)
+static void __mp_change_multiple_widgets(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path)
 {
        Eina_List *temp_list = NULL;
        WidgetData* wgtdata = NULL;