From 97561689406c48bc5f28c74130689a4ad0efaaaf Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sun, 4 Jul 2021 21:53:02 +1000 Subject: [PATCH] CommonHostInterface: Don't reset volume when fast forwarding --- src/frontend-common/common_host_interface.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp index af4846496..d4aaa9f67 100644 --- a/src/frontend-common/common_host_interface.cpp +++ b/src/frontend-common/common_host_interface.cpp @@ -926,7 +926,10 @@ void CommonHostInterface::UpdateSpeedLimiterState() m_audio_stream->SetInputSampleRate(input_sample_rate); m_audio_stream->SetWaitForBufferFill(!m_display_all_frames); - m_audio_stream->SetOutputVolume(GetAudioOutputVolume()); + + if (g_settings.audio_fast_forward_volume != g_settings.audio_output_volume) + m_audio_stream->SetOutputVolume(GetAudioOutputVolume()); + m_audio_stream->SetSync(audio_sync_enabled); if (audio_sync_enabled) m_audio_stream->EmptyBuffers();