From b86110c4c37aa6049aaa1f343e89d1a205edf446 Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Tue, 19 Dec 2017 20:16:18 +0900 Subject: [PATCH] Add sound manager destroy when setting sound manager watch cb is failed Change-Id: I03ad2dd718ebbe8a893390fe8856842a9c8f3a92 Signed-off-by: sooyeon.kim (cherry picked from commit e780e3e850703ff9d9efdc2aa45e4f13f60ea155) --- server/ttsd_player.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/ttsd_player.c b/server/ttsd_player.c index 54d1ef6..be47d32 100644 --- a/server/ttsd_player.c +++ b/server/ttsd_player.c @@ -767,6 +767,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"); @@ -775,8 +776,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; -- 2.7.4