System: Only use fast forward volume for >1 speed

pull/3760/head
Stenzek 2 weeks ago
parent 73967c5c40
commit 9e4ef8bd69
No known key found for this signature in database

@ -414,11 +414,6 @@ struct Settings : public GPUSettings
ALWAYS_INLINE bool IsRunaheadEnabled() const { return (runahead_frames > 0); } ALWAYS_INLINE bool IsRunaheadEnabled() const { return (runahead_frames > 0); }
ALWAYS_INLINE u8 GetAudioOutputVolume(bool fast_forwarding) const
{
return audio_output_muted ? 0 : (fast_forwarding ? audio_fast_forward_volume : audio_output_volume);
}
/// Returns the default type for the specified port. /// Returns the default type for the specified port.
ALWAYS_INLINE static ControllerType GetDefaultControllerType(u32 pad) ALWAYS_INLINE static ControllerType GetDefaultControllerType(u32 pad)
{ {

@ -5329,7 +5329,9 @@ bool System::IsFastForwardingBoot()
u8 System::GetAudioOutputVolume() u8 System::GetAudioOutputVolume()
{ {
return g_settings.GetAudioOutputVolume(IsRunningAtNonStandardSpeed()); return ((s_state.target_speed == 0.0 || s_state.target_speed > 1.0f) && !s_state.syncing_to_host) ?
g_settings.audio_fast_forward_volume :
g_settings.audio_output_volume;
} }
void System::UpdateVolume() void System::UpdateVolume()

Loading…
Cancel
Save