Fixed SVACE Errors 38/79838/2 submit/tizen_mobile/20160713.135713
authorbhutani.92 <bhutani.92@samsung.com>
Wed, 13 Jul 2016 07:40:35 +0000 (13:10 +0530)
committerbhutani.92 <bhutani.92@samsung.com>
Wed, 13 Jul 2016 07:53:28 +0000 (13:23 +0530)
Change-Id: Ia4669572b6797f1ef89d7e723b3dd47b5322dec4
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>
src/core/mp-player-mgr.c
src/widget/mp-all-list.c

index 6cb72f30e6079708e636803c7ea8f6f61bdb51f3..c3e06aa44b3acf0f283d8bb77da44dcbe0740917 100755 (executable)
@@ -1168,7 +1168,7 @@ void mp_player_focus_callback(sound_stream_info_h stream_info, sound_stream_focu
                        sound_manager_get_focus_reacquisition(ad->stream_info, &reacquire_state);
                        if (!strcmp(additional_info, "cam_capture")) {
                                sound_manager_set_focus_reacquisition(ad->stream_info, EINA_TRUE);
-                       } else if (reason_for_change == SOUND_STREAM_FOCUS_CHANGED_BY_RINGTONE || SOUND_STREAM_FOCUS_CHANGED_BY_VOIP || SOUND_STREAM_FOCUS_CHANGED_BY_CALL) {
+                       } else if ((reason_for_change == SOUND_STREAM_FOCUS_CHANGED_BY_RINGTONE) || (reason_for_change == SOUND_STREAM_FOCUS_CHANGED_BY_VOIP) || (reason_for_change == SOUND_STREAM_FOCUS_CHANGED_BY_CALL)) {
                                sound_manager_set_focus_reacquisition(ad->stream_info, EINA_TRUE);
                        } else if (reacquire_state == EINA_TRUE) {
                                sound_manager_set_focus_reacquisition(ad->stream_info, EINA_FALSE);
index b8c93feaa14dffac1e034c03990ad468e5fd8864..66075417451db15e7807b0ef4f40f8c526f97def 100755 (executable)
@@ -414,11 +414,13 @@ void _mp_all_list_append_shuffle_item(MpAllList_t *list)
 
        if (NULL == list->itc_shuffle) {
                list->itc_shuffle = elm_genlist_item_class_new();
-               list->itc_shuffle->item_style = "music/1text.2icon.3";/*"music/3text.1icon.2"*/
-               list->itc_shuffle->func.text_get = _mp_all_list_shuffle_text_get;
-               list->itc_shuffle->decorate_all_item_style = NULL;
-               list->itc_shuffle->func.content_get = _mp_all_list_shuffle_icon_get;
-               list->itc_shuffle->func.del = _mp_all_list_songs_item_del_cb;
+               if (list->itc_shuffle) {
+                       list->itc_shuffle->item_style = "music/1text.2icon.3";/*"music/3text.1icon.2"*/
+                       list->itc_shuffle->func.text_get = _mp_all_list_shuffle_text_get;
+                       list->itc_shuffle->decorate_all_item_style = NULL;
+                       list->itc_shuffle->func.content_get = _mp_all_list_shuffle_icon_get;
+                       list->itc_shuffle->func.del = _mp_all_list_songs_item_del_cb;
+               }
        }
 
        mp_list_item_data_t *item_data;
@@ -2482,9 +2484,11 @@ static void _mp_all_list_create_genlist(Evas_Object *parent, MpAllList_t *list)
        list->itc = elm_genlist_item_class_new();
 
        list->itc_icon = elm_genlist_item_class_new();
-       list->itc_icon->item_style = "music/1icon/no_padding";/*"music/3text.1icon.2"*/
-       list->itc_icon->func.content_get = _mp_all_list_content_get;
-       list->itc_icon->func.del = NULL;
+       if (list->itc_icon) {
+               list->itc_icon->item_style = "music/1icon/no_padding";/*"music/3text.1icon.2"*/
+               list->itc_icon->func.content_get = _mp_all_list_content_get;
+               list->itc_icon->func.del = NULL;
+       }
 
        /*create floating widget manager*/
        list->FwMgr = mp_floating_widget_mgr_create(list->genlist);