From: sooyeon.kim Date: Fri, 28 May 2021 07:39:37 +0000 (+0900) Subject: Remove ducking when background volume is changed X-Git-Tag: accepted/tizen/unified/20210702.133343~3^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F35%2F260635%2F1;p=platform%2Fcore%2Fuifw%2Ftts.git Remove ducking when background volume is changed Change-Id: I49fff0e042938786ea001dddfeb2f9ef67ded6e8 Signed-off-by: sooyeon.kim (cherry picked from commit e62a27b107eee9febed04b3af7c2687533de104b) --- diff --git a/server/ttsd_player.c b/server/ttsd_player.c index e065150..5b5d85e 100644 --- a/server/ttsd_player.c +++ b/server/ttsd_player.c @@ -279,7 +279,7 @@ void __player_focus_state_watch_cb(int id, sound_stream_focus_mask_e focus_mask, void __sound_stream_ducking_state_changed_cb(sound_stream_ducking_h stream_ducking, bool is_ducked, void *user_data) { SLOG(LOG_DEBUG, tts_tag(), "@@@ ducking state changed cb"); - SLOG(LOG_DEBUG, tts_tag(), "[Player] is ducked : %d", is_ducked); + SLOG(LOG_ERROR, tts_tag(), "[Player] ducking_h(%p) is ducked : %d", stream_ducking, is_ducked); // ducking_flag = true; return; } @@ -416,8 +416,6 @@ static void __end_play_thread(void *data, Ecore_Thread *thread) static void __set_policy_for_playing(int volume) { - __change_background_volume(); - /* Set stream info */ int ret; ttsd_mode_e mode = ttsd_get_mode(); @@ -442,7 +440,9 @@ static void __set_policy_for_playing(int volume) SLOG(LOG_WARN, tts_tag(), "[Player WARNING] Fail to set stream info"); } + __change_background_volume(); g_is_set_policy = true; + SLOG(LOG_ERROR, tts_tag(), "[BG] g_is_set_policy(%d)", g_is_set_policy); SLOG(LOG_DEBUG, tts_tag(), "[Player DEBUG] set policy for playing"); @@ -474,8 +474,9 @@ static void __unset_policy_for_playing() } __recover_background_volume(); - g_is_set_policy = false; + SLOG(LOG_ERROR, tts_tag(), "[BG] g_is_set_policy(%d)", g_is_set_policy); + SLOG(LOG_DEBUG, tts_tag(), "[Player DEBUG] unset policy for playing"); @@ -1568,31 +1569,8 @@ int ttsd_player_set_background_volume_ratio(double ratio) double prev_ratio = g_bg_volume_ratio; g_bg_volume_ratio = ratio; - if (g_bg_volume_ratio != prev_ratio) { - SLOG(LOG_DEBUG, tts_tag(), "[Player DEBUG] Check whether sound is ducked and Change volume. as-is(%lf), to-be(%lf)", prev_ratio, g_bg_volume_ratio); + SLOG(LOG_DEBUG, tts_tag(), "[Player DEBUG] Check whether sound is ducked and Change volume. as-is(%lf), to-be(%lf)", prev_ratio, g_bg_volume_ratio); - bool is_ducked = false; - int ret = sound_manager_is_ducked(g_media_stream_ducking, &is_ducked); - if (0 == ret && true == is_ducked) { - __deactivate_ducking_sound_stream(SOUND_STREAM_TYPE_MEDIA, g_media_stream_ducking); - __activate_ducking_sound_stream(SOUND_STREAM_TYPE_MEDIA, g_media_stream_ducking); - } - ret = sound_manager_is_ducked(g_system_stream_ducking, &is_ducked); - if (0 == ret && true == is_ducked) { - __deactivate_ducking_sound_stream(SOUND_STREAM_TYPE_SYSTEM, g_system_stream_ducking); - __activate_ducking_sound_stream(SOUND_STREAM_TYPE_SYSTEM, g_system_stream_ducking); - } - ret = sound_manager_is_ducked(g_notification_stream_ducking, &is_ducked); - if (0 == ret && true == is_ducked) { - __deactivate_ducking_sound_stream(SOUND_STREAM_TYPE_NOTIFICATION, g_notification_stream_ducking); - __activate_ducking_sound_stream(SOUND_STREAM_TYPE_NOTIFICATION, g_notification_stream_ducking); - } - ret = sound_manager_is_ducked(g_alarm_stream_ducking, &is_ducked); - if (0 == ret && true == is_ducked) { - __deactivate_ducking_sound_stream(SOUND_STREAM_TYPE_ALARM, g_alarm_stream_ducking); - __activate_ducking_sound_stream(SOUND_STREAM_TYPE_ALARM, g_alarm_stream_ducking); - } - } return TTSD_ERROR_NONE; }