Fixed TSAM-10066 Camera not acquiring focus on capturing image 09/98709/2
authorbhutani.92 <bhutani.92@samsung.com>
Fri, 18 Nov 2016 09:56:40 +0000 (15:26 +0530)
committerAkhil Bhutani <bhutani.92@samsung.com>
Fri, 18 Nov 2016 09:42:42 +0000 (01:42 -0800)
Change-Id: I40777e8467bf1f38fe387fd42d02445d2b933f24
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>
src/core/mp-player-mgr.c
src/widget/mp-minicontroller.c

index 356281c0010a31812fb88ad11b779091e538ab62..ee58c003607ee332f1c6c76f0b7ff4153b01ae2b 100755 (executable)
@@ -1168,8 +1168,6 @@ void mp_player_focus_callback(sound_stream_info_h stream_info, sound_stream_focu
                                reason_for_change != SOUND_STREAM_FOCUS_CHANGED_BY_NOTIFICATION) {
                        if (!g_strcmp0(additional_info, "music_playing")) {
                                sound_manager_set_focus_reacquisition(ad->stream_info, EINA_FALSE);
-                       } else if (!g_strcmp0(additional_info, "cam_capture")) {
-                               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);
                        }
@@ -1177,12 +1175,6 @@ void mp_player_focus_callback(sound_stream_info_h stream_info, sound_stream_focu
                        sound_manager_set_focus_reacquisition(ad->stream_info, EINA_FALSE);
                }
        } else {
-               if (ad->stream_info && !g_strcmp0(additional_info, "cam_capture")) {
-                       ret = sound_manager_release_focus(ad->stream_info, SOUND_STREAM_FOCUS_FOR_PLAYBACK, NULL);
-                       if (ret != SOUND_MANAGER_ERROR_NONE) {
-                               ERROR_TRACE("failed to release focus error[%x]", ret);
-                       }
-               }
                mp_play_control_play_pause(ad, true);
        }
 }
index f8e70ded3701d8f218c8210411bb27aebe48aa30..81abc76e067a788d28aec657a5e7fc781daeecf6 100755 (executable)
@@ -686,11 +686,6 @@ int _mp_is_current_focus_available(struct appdata *ad)
                return -1;
        }
 
-       if (additional_info && changed_by == SOUND_STREAM_FOCUS_CHANGED_BY_MEDIA && !g_strcmp0(additional_info, "cam_capture")) {
-               DEBUG_TRACE("Cannot resume Music Player due to state: %s", additional_info);
-               return -1;
-       }
-
        if (ad->recorder_state == RECORDER_DEVICE_STATE_RECORDING || ad->recorder_state == RECORDER_DEVICE_STATE_PAUSED) {
                DEBUG_TRACE("Cannot resume Music Player. Video Recorder is in use");
                return -1;