From ba2b30d61096d984514d736c95eea59e758e01ed Mon Sep 17 00:00:00 2001 From: sooyeon Date: Wed, 8 Sep 2021 00:56:41 +0900 Subject: [PATCH] Comment out codes to duck system sound Change-Id: Id8274794fac89559f01c06802d307b7adf6b306b Signed-off-by: sooyeon --- server/ttsd_player.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server/ttsd_player.c b/server/ttsd_player.c index bc03d133..2b60c956 100644 --- a/server/ttsd_player.c +++ b/server/ttsd_player.c @@ -86,7 +86,7 @@ static audio_out_h g_audio_h; static sound_stream_info_h g_stream_info_h; static sound_stream_ducking_h g_media_stream_ducking; -static sound_stream_ducking_h g_system_stream_ducking; +//static sound_stream_ducking_h g_system_stream_ducking; static sound_stream_ducking_h g_notification_stream_ducking; static sound_stream_ducking_h g_alarm_stream_ducking; @@ -328,7 +328,7 @@ static void __change_background_volume() SLOG(LOG_INFO, tts_tag(), "[Player] volume ratio(%lf)", g_bg_volume_ratio); if (1.0 > g_bg_volume_ratio) { __activate_ducking_sound_stream(SOUND_STREAM_TYPE_MEDIA, g_media_stream_ducking); - __activate_ducking_sound_stream(SOUND_STREAM_TYPE_SYSTEM, g_system_stream_ducking); +// __activate_ducking_sound_stream(SOUND_STREAM_TYPE_SYSTEM, g_system_stream_ducking); __activate_ducking_sound_stream(SOUND_STREAM_TYPE_NOTIFICATION, g_notification_stream_ducking); __activate_ducking_sound_stream(SOUND_STREAM_TYPE_ALARM, g_alarm_stream_ducking); } @@ -354,7 +354,7 @@ static int __deactivate_ducking_sound_stream(sound_stream_type_e stream_type, so static void __recover_background_volume() { __deactivate_ducking_sound_stream(SOUND_STREAM_TYPE_MEDIA, g_media_stream_ducking); - __deactivate_ducking_sound_stream(SOUND_STREAM_TYPE_SYSTEM, g_system_stream_ducking); +// __deactivate_ducking_sound_stream(SOUND_STREAM_TYPE_SYSTEM, g_system_stream_ducking); __deactivate_ducking_sound_stream(SOUND_STREAM_TYPE_NOTIFICATION, g_notification_stream_ducking); __deactivate_ducking_sound_stream(SOUND_STREAM_TYPE_ALARM, g_alarm_stream_ducking); } @@ -1016,14 +1016,14 @@ int __create_ducking_handle(void) SLOG(LOG_INFO, tts_tag(), "[Player INFO] Ducking handle for media stream is already created"); } - if (NULL == g_system_stream_ducking) { +/* if (NULL == g_system_stream_ducking) { ret = sound_manager_create_stream_ducking(SOUND_STREAM_TYPE_SYSTEM, __sound_stream_ducking_state_changed_cb, NULL, &g_system_stream_ducking); if (SOUND_MANAGER_ERROR_NONE != ret) SLOG(LOG_WARN, tts_tag(), "[Player WARNING] Fail to create stream ducking for system type, ret(%d)", ret); } else { SLOG(LOG_INFO, tts_tag(), "[Player INFO] Ducking handle for system stream is already created"); } - +*/ if (NULL == g_notification_stream_ducking) { ret = sound_manager_create_stream_ducking(SOUND_STREAM_TYPE_NOTIFICATION, __sound_stream_ducking_state_changed_cb, NULL, &g_notification_stream_ducking); if (SOUND_MANAGER_ERROR_NONE != ret) @@ -1133,12 +1133,12 @@ static void __destroy_all_ducking_handles() } g_media_stream_ducking = NULL; - ret = sound_manager_destroy_stream_ducking(g_system_stream_ducking); +/* ret = sound_manager_destroy_stream_ducking(g_system_stream_ducking); if (SOUND_MANAGER_ERROR_NONE != ret) { SLOG(LOG_WARN, tts_tag(), "[Player WARNING] Fail to destroy ducking handle, ret(%d)", ret); } g_system_stream_ducking = NULL; - +*/ ret = sound_manager_destroy_stream_ducking(g_notification_stream_ducking); if (SOUND_MANAGER_ERROR_NONE != ret) { SLOG(LOG_WARN, tts_tag(), "[Player WARNING] Fail to destroy ducking handle, ret(%d)", ret); -- 2.34.1