ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPU: Allow up to 200% final volume

This commit is contained in:
refractionpcsx2 2022-10-04 21:25:09 +01:00
parent 7c3aa65166
commit 2f7d45db09
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2-qt/Settings/AudioSettingsWidget.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>752</width>
<height>430</height>
<height>448</height>
</rect>
</property>
<property name="windowTitle">
@ -402,7 +402,7 @@
<item row="0" column="0">
<widget class="QSlider" name="volume">
<property name="maximum">
<number>100</number>
<number>200</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>

2
pcsx2/Frontend/FullscreenUI.cpp
View File

@ -2843,7 +2843,7 @@ void FullscreenUI::DrawAudioSettingsPage()
MenuHeading("Runtime Settings");
DrawIntRangeSetting(bsi, ICON_FA_VOLUME_UP " Output Volume", "Applies a global volume modifier to all sound produced by the game.",
"SPU2/Mixing", "FinalVolume", 100, 0, 100, "%d%%");
"SPU2/Mixing", "FinalVolume", 100, 0, 200, "%d%%");
MenuHeading("Mixing Settings");
DrawIntListSetting(bsi, ICON_FA_MUSIC " Interpolation Mode", "Determines how ADPCM samples are interpolated to the target pitch.",

4
pcsx2/SPU2/Host/Config.cpp
View File

@ -75,8 +75,8 @@ void ReadSettings()
{
Interpolation = Host::GetIntSettingValue("SPU2/Mixing", "Interpolation", 5);
FinalVolume = ((float)Host::GetIntSettingValue("SPU2/Mixing", "FinalVolume", 100)) / 100;
if (FinalVolume > 1.0f)
FinalVolume = 1.0f;
if (FinalVolume > 2.0f)
FinalVolume = 2.0f;
AdvancedVolumeControl = Host::GetBoolSettingValue("SPU2/Mixing", "AdvancedVolumeControl", false);
VolumeAdjustCdb = Host::GetFloatSettingValue("SPU2/Mixing", "VolumeAdjustC", 0);

4
pcsx2/SPU2/Linux/Config.cpp
View File

@ -81,8 +81,8 @@ void ReadSettings()
Interpolation = CfgReadInt(L"MIXING", L"Interpolation", 5);
FinalVolume = ((float)CfgReadInt(L"MIXING", L"FinalVolume", 100)) / 100;
if (FinalVolume > 1.0f)
FinalVolume = 1.0f;
if (FinalVolume > 2.0f)
FinalVolume = 2.0f;
AdvancedVolumeControl = CfgReadBool(L"MIXING", L"AdvancedVolumeControl", false);
VolumeAdjustCdb = CfgReadFloat(L"MIXING", L"VolumeAdjustC(dB)", 0);

6
pcsx2/SPU2/Windows/Config.cpp
View File

@ -81,8 +81,8 @@ void ReadSettings()
Interpolation = CfgReadInt(L"MIXING", L"Interpolation", 5);
FinalVolume = ((float)CfgReadInt(L"MIXING", L"FinalVolume", 100)) / 100;
if (FinalVolume > 1.0f)
FinalVolume = 1.0f;
if (FinalVolume > 2.0f)
FinalVolume = 2.0f;
AdvancedVolumeControl = CfgReadBool(L"MIXING", L"AdvancedVolumeControl", false);
VolumeAdjustCdb = CfgReadFloat(L"MIXING", L"VolumeAdjustC(dB)", 0);
@ -359,7 +359,7 @@ BOOL CALLBACK ConfigProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
SetWindowText(GetDlgItem(hWnd, IDC_LATENCY_LABEL), temp);
int configvol = (int)(FinalVolume * 100);
INIT_SLIDER(IDC_VOLUME_SLIDER, 0, 100, 10, 5, 1);
INIT_SLIDER(IDC_VOLUME_SLIDER, 0, 200, 10, 5, 1);
SendDialogMsg(hWnd, IDC_VOLUME_SLIDER, TBM_SETPOS, TRUE, configvol);
swprintf_s(temp, L"%d%%", configvol);

2
pcsx2/SPU2/wx/wxConfig.cpp
View File

@ -60,7 +60,7 @@ MixerTab::MixerTab(wxWindow* parent)
// Volume Slider
m_volume_box = new wxStaticBoxSizer(wxVERTICAL, this, "Volume");
m_volume_slider = new wxSlider(this, wxID_ANY, FinalVolume * 100, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
m_volume_slider = new wxSlider(this, wxID_ANY, FinalVolume * 100, 0, 200, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
m_volume_box->Add(m_volume_slider, wxSizerFlags().Expand());
m_audio_box = new wxBoxSizer(wxVERTICAL);