From: aravind.gara <aravind.gara@samsung.com>
Date: Tue, 22 Nov 2016 10:13:10 +0000 (+0900)
Subject: sound-manager API changed
X-Git-Tag: submit/tizen_3.0/20161202.035416~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a4ea662387c4c3174fe21755c5893debbec7c7d;p=platform%2Fcore%2Fmessaging%2Fmsg-service.git

sound-manager API changed

Change-Id: Icc429491b49e1d680e25eaf564b55716a12d7469
Signed-off-by: aravind.gara <aravind.gara@samsung.com>
---

diff --git a/manager/src/msg-manager-sound.cpp b/manager/src/msg-manager-sound.cpp
index 9831e66..16ce016 100644
--- a/manager/src/msg-manager-sound.cpp
+++ b/manager/src/msg-manager-sound.cpp
@@ -105,14 +105,12 @@ static void MsgMgrSoundPlayeInterruptedCallback(player_interrupted_code_e code,
 	MsgMgrSoundPlayStop();
 }
 
-static void MsgStreamFocusCallback(sound_stream_info_h stream_info, sound_stream_focus_change_reason_e reason_for_change, const char *additional_info, void *user_data)
+static void MsgStreamFocusCallback(sound_stream_info_h stream_info, sound_stream_focus_mask_e focus_mask, sound_stream_focus_state_e focus_state,
+                                   sound_stream_focus_change_reason_e reason_for_change, int sound_behavior, const char *additional_info, void *user_data)
 {
 	MSG_MGR_DEBUG("MsgStreamFocusCallback called, reason_for_change [%d], additional_info [%s]", reason_for_change, additional_info);
 
-	sound_stream_focus_state_e playback_focus_state = SOUND_STREAM_FOCUS_STATE_ACQUIRED;
-
-	sound_manager_get_focus_state(stream_info, &playback_focus_state, NULL);
-	if (playback_focus_state == SOUND_STREAM_FOCUS_STATE_RELEASED) {
+	if ((focus_mask == SOUND_STREAM_FOCUS_FOR_PLAYBACK) && (focus_state == SOUND_STREAM_FOCUS_STATE_RELEASED)) {
 		MSG_MGR_DEBUG("sound stream focus released");
 		MsgMgrSoundPlayStop();
 	}
@@ -465,7 +463,7 @@ int MsgMgrStreamStart(MSG_MGR_SOUND_TYPE_T soundType)
 		return err;
 	}
 
-	err = sound_manager_acquire_focus(g_stream_info, SOUND_STREAM_FOCUS_FOR_PLAYBACK, NULL);
+	err = sound_manager_acquire_focus(g_stream_info, SOUND_STREAM_FOCUS_FOR_PLAYBACK, SOUND_BEHAVIOR_NONE, NULL);
 	pthread_mutex_unlock(&muStream);
 
 	MSG_MGR_END();
@@ -479,7 +477,7 @@ void MsgMgrStreamStop()
 	pthread_mutex_lock(&muStream);
 
 	if (g_stream_info != NULL) {
-		int err = sound_manager_release_focus(g_stream_info, SOUND_STREAM_FOCUS_FOR_PLAYBACK, NULL);
+		int err = sound_manager_release_focus(g_stream_info, SOUND_STREAM_FOCUS_FOR_PLAYBACK, SOUND_BEHAVIOR_NONE, NULL);
 		if (err != SOUND_MANAGER_ERROR_NONE)
 			MSG_MGR_DEBUG("sound_manager_release_focus() Failed : %d", err);