Merge "Fix to deallocate memory of sound and speak data" into tizen

[platform/core/uifw/tts.git] / server / ttsd_player.c

diff --git a/server/ttsd_player.c b/server/ttsd_player.c
index 4999021..a2d2e26 100644 (file)
--- a/server/ttsd_player.c
+++ b/server/ttsd_player.c
@@ -351,7 +351,9 @@ int ttsd_player_check_current_playback_focus(bool *is_current_interrupt)
 
                ret = sound_manager_get_current_playback_focus(&reason, &sound_behavior, &extra_info);
 
-               if (SOUND_MANAGER_ERROR_NONE == ret && NULL != extra_info) {
+               SLOG(LOG_DEBUG, tts_tag(), "[Player] current playback focus: extra_info(%s), reason(%d), sound_behavior(%d)", extra_info, reason, sound_behavior, extra_info);
+
+               if (SOUND_MANAGER_ERROR_NONE == ret && NULL != extra_info && 0 < strlen(extra_info)) {
                        if (SOUND_STREAM_FOCUS_CHANGED_BY_VOICE_INFORMATION == reason && 0 == strncmp(extra_info, "TTSD_MODE_INTERRUPT", strlen(extra_info))) {
                                SLOG(LOG_DEBUG, tts_tag(), "[Player] The current focus in Interrupt. Cannot play the requested sound data");
                                *is_current_interrupt = true;
@@ -707,6 +709,7 @@ int ttsd_player_init()
        ret = sound_manager_add_focus_state_watch_cb(SOUND_STREAM_FOCUS_FOR_PLAYBACK, __player_focus_state_watch_cb, NULL, &g_focus_watch_id);
        if (SOUND_MANAGER_ERROR_NONE != ret) {
                SLOG(LOG_ERROR, tts_tag(), "[Player ERROR] Fail to add sound focus watch callback");
+               sound_manager_destroy_stream_information(g_stream_info_h);
                return -1;
        } else {
                SLOG(LOG_DEBUG, tts_tag(), "[Player SUCCESS] Add sound focus watch callback");
@@ -715,8 +718,11 @@ int ttsd_player_init()
        ecore_thread_max_set(1);
 
        ret = __create_audio_out(TTSE_AUDIO_TYPE_RAW_S16, 16000);
-       if (0 != ret)
+       if (0 != ret) {
+               sound_manager_destroy_stream_information(g_stream_info_h);
+               sound_manager_remove_focus_state_watch_cb(g_focus_watch_id);
                return -1;
+       }
 
        g_player_init = true;