Revert "sound-manager API changed"

This reverts commit 2c2a1320539c24b872772c15c5a9337bba134ee7.

Change-Id: I93bb56fb617397c705c3bd46f46880b165b7651e

diff --git a/src/SttManager.cpp b/src/SttManager.cpp
index 517b250..d8c53b5 100755 (executable)
--- a/src/SttManager.cpp
+++ b/src/SttManager.cpp
@@ -50,8 +50,7 @@ static inline const char *stt_state_str(stt_state_e cur) {
                return (const char *) "ABNORMAL CASE";
 }
 
-static void player_focus_state_cb(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_behaviors, const char *extra_info, void *user_data)
+static void player_focus_state_cb(sound_stream_info_h stream_info, sound_stream_focus_change_reason_e reason_for_change, const char *extra_info, void *user_data)
 {
 }
 
@@ -141,7 +140,7 @@ void SttManager::Start() {
        asrtype = STT_RECOGNITION_TYPE_FREE_PARTIAL;
        int ret;
 
-       ret = sound_manager_acquire_focus(g_stream_info_h, (sound_stream_focus_mask_e)(SOUND_STREAM_FOCUS_FOR_PLAYBACK | SOUND_STREAM_FOCUS_FOR_RECORDING), SOUND_BEHAVIOR_NONE, NULL);
+       ret = sound_manager_acquire_focus(g_stream_info_h, (sound_stream_focus_mask_e)(SOUND_STREAM_FOCUS_FOR_PLAYBACK | SOUND_STREAM_FOCUS_FOR_RECORDING), NULL);
        if (SOUND_MANAGER_ERROR_NONE != ret) {
                LOGW("Fail to acquire playback or recording focus. ret : %d, stream handle : %p", ret, g_stream_info_h);
        }
@@ -555,7 +554,7 @@ void SttManager::EnableSilenceDetection(bool enabled) {
 
 void SttManager::ReleaseSoundFocus()
 {
-       int ret = sound_manager_release_focus(g_stream_info_h, (sound_stream_focus_mask_e)(SOUND_STREAM_FOCUS_FOR_PLAYBACK | SOUND_STREAM_FOCUS_FOR_RECORDING), SOUND_BEHAVIOR_NONE, NULL);
+       int ret = sound_manager_release_focus(g_stream_info_h, (sound_stream_focus_mask_e)(SOUND_STREAM_FOCUS_FOR_PLAYBACK | SOUND_STREAM_FOCUS_FOR_RECORDING), NULL);
        if (SOUND_MANAGER_ERROR_NONE != ret) {
                LOGW("Fail to release playback or recording focus. ret : %d", ret);
        }