Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-25 23:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

System: Fix inverted volume selection

Browse source
This commit is contained in:
Stenzek 2024-05-27 11:46:18 +10:00
parent 110fa28c25
commit 2eb0085539
No known key found for this signature in database
2 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/system.cpp
View file

@ -2995,7 +2995,7 @@ GPUVSyncMode System::GetEffectiveVSyncMode()
bool System::ShouldAllowPresentThrottle()
{
const bool valid_vm = (s_state != State::Shutdown && s_state != State::Stopping);
return !valid_vm || !IsRunningAtNonStandardSpeed();
return !valid_vm || IsRunningAtNonStandardSpeed();
}
bool System::IsFastForwardEnabled()
@ -4633,7 +4633,7 @@ bool System::IsRunningAtNonStandardSpeed()
if (!IsValid())
return false;
return (s_target_speed == 1.0f || s_syncing_to_host);
return (s_target_speed != 1.0f && !s_syncing_to_host);
}
s32 System::GetAudioOutputVolume()

46
src/duckstation-qt/audiosettingswidget.ui
View file

@ -188,7 +188,7 @@
<number>50</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TickPosition::TicksBothSides</enum>
@ -272,6 +272,13 @@
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Fast Forward Volume:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
@ -321,26 +328,23 @@
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Fast Forward Volume:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="muted">
<property name="text">
<string>Mute All Sound</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="muteCDAudio">
<property name="text">
<string>Mute CD Audio</string>
</property>
</widget>
<item row="2" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QCheckBox" name="muted">
<property name="text">
<string>Mute All Sound</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="muteCDAudio">
<property name="text">
<string>Mute CD Audio</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>