diff --git a/pcsx2/SPU2/Config.h b/pcsx2/SPU2/Config.h index fc3ce8481b..362d60e866 100644 --- a/pcsx2/SPU2/Config.h +++ b/pcsx2/SPU2/Config.h @@ -66,7 +66,6 @@ extern wxString RegDumpFileName; extern int Interpolation; extern int numSpeakers; -extern bool EffectsDisabled; extern float FinalVolume; // Global / pre-scale extern bool AdvancedVolumeControl; extern float VolumeAdjustFLdb; diff --git a/pcsx2/SPU2/Linux/Config.cpp b/pcsx2/SPU2/Linux/Config.cpp index 06afc25f94..35a120e904 100644 --- a/pcsx2/SPU2/Linux/Config.cpp +++ b/pcsx2/SPU2/Linux/Config.cpp @@ -39,7 +39,6 @@ int Interpolation = 5; 5. Gaussian interpolation */ -bool EffectsDisabled = false; float FinalVolume; // global bool AdvancedVolumeControl; float VolumeAdjustFLdb; // Decibels settings, because audiophiles love that. @@ -86,7 +85,6 @@ void ReadSettings() initIni(); Interpolation = CfgReadInt(L"MIXING", L"Interpolation", 5); - EffectsDisabled = CfgReadBool(L"MIXING", L"Disable_Effects", false); postprocess_filter_dealias = CfgReadBool(L"MIXING", L"DealiasFilter", false); FinalVolume = ((float)CfgReadInt(L"MIXING", L"FinalVolume", 100)) / 100; if (FinalVolume > 1.0f) @@ -188,7 +186,6 @@ void WriteSettings() } CfgWriteInt(L"MIXING", L"Interpolation", Interpolation); - CfgWriteBool(L"MIXING", L"Disable_Effects", EffectsDisabled); CfgWriteBool(L"MIXING", L"DealiasFilter", postprocess_filter_dealias); CfgWriteInt(L"MIXING", L"FinalVolume", (int)(FinalVolume * 100 + 0.5f)); diff --git a/pcsx2/SPU2/Linux/Config.h b/pcsx2/SPU2/Linux/Config.h index 1d97a49406..1e9979f883 100644 --- a/pcsx2/SPU2/Linux/Config.h +++ b/pcsx2/SPU2/Linux/Config.h @@ -65,7 +65,6 @@ static __forceinline bool RegDump() { return _RegDump & DebugEnabled; }*/ //extern wchar_t RegDumpFileName[255]; extern int Interpolation; -extern bool EffectsDisabled; extern float FinalVolume; extern bool postprocess_filter_enabled; extern bool postprocess_filter_dealias; diff --git a/pcsx2/SPU2/Mixer.cpp b/pcsx2/SPU2/Mixer.cpp index df775a4e0f..51ec53527a 100644 --- a/pcsx2/SPU2/Mixer.cpp +++ b/pcsx2/SPU2/Mixer.cpp @@ -695,11 +695,6 @@ StereoOut32 V_Core::Mix(const VoiceMixSet& inVoices, const StereoOut32& Input, c TD.Left += Ext.Left & DryGate.ExtL; TD.Right += Ext.Right & DryGate.ExtR; - // User-level Effects disabling. Nice speedup but breaks games that depend on - // reverb IRQs (very few -- if you find one name it here!). - if (EffectsDisabled) - return TD; - // ---------------------------------------------------------------------------- // Reverberation Effects Processing // ---------------------------------------------------------------------------- diff --git a/pcsx2/SPU2/Windows/Config.cpp b/pcsx2/SPU2/Windows/Config.cpp index 3c753cc3c3..b6d0485fd3 100644 --- a/pcsx2/SPU2/Windows/Config.cpp +++ b/pcsx2/SPU2/Windows/Config.cpp @@ -37,8 +37,6 @@ int Interpolation = 5; 5. Gaussian interpolation */ -bool EffectsDisabled = false; - float FinalVolume; // Global bool AdvancedVolumeControl; float VolumeAdjustFLdb; // Decibels settings, because audiophiles love that. @@ -85,7 +83,6 @@ void ReadSettings() { Interpolation = CfgReadInt(L"MIXING", L"Interpolation", 5); - EffectsDisabled = CfgReadBool(L"MIXING", L"Disable_Effects", false); postprocess_filter_dealias = CfgReadBool(L"MIXING", L"DealiasFilter", false); FinalVolume = ((float)CfgReadInt(L"MIXING", L"FinalVolume", 100)) / 100; if (FinalVolume > 1.0f) @@ -163,7 +160,6 @@ void WriteSettings() { CfgWriteInt(L"MIXING", L"Interpolation", Interpolation); - CfgWriteBool(L"MIXING", L"Disable_Effects", EffectsDisabled); CfgWriteBool(L"MIXING", L"DealiasFilter", postprocess_filter_dealias); CfgWriteInt(L"MIXING", L"FinalVolume", (int)(FinalVolume * 100 + 0.5f)); @@ -279,7 +275,6 @@ BOOL CALLBACK ConfigProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) EnableWindow(GetDlgItem(hWnd, IDC_OPEN_CONFIG_SOUNDTOUCH), (SynchMode == 0)); EnableWindow(GetDlgItem(hWnd, IDC_OPEN_CONFIG_DEBUG), DebugEnabled); - SET_CHECK(IDC_EFFECTS_DISABLE, EffectsDisabled); SET_CHECK(IDC_DEALIASFILTER, postprocess_filter_dealias); SET_CHECK(IDC_DEBUG_ENABLE, DebugEnabled); SET_CHECK(IDC_DSP_ENABLE, dspPluginEnabled); @@ -365,7 +360,6 @@ BOOL CALLBACK ConfigProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) SoundtouchCfg::OpenDialog(hWnd); break; - HANDLE_CHECK(IDC_EFFECTS_DISABLE, EffectsDisabled); HANDLE_CHECK(IDC_DEALIASFILTER, postprocess_filter_dealias); HANDLE_CHECK(IDC_DSP_ENABLE, dspPluginEnabled); HANDLE_CHECKNB(IDC_DEBUG_ENABLE, DebugEnabled); diff --git a/pcsx2/SPU2/Windows/SPU2.rc b/pcsx2/SPU2/Windows/SPU2.rc index bb6449c96f..d34b45db6c 100644 --- a/pcsx2/SPU2/Windows/SPU2.rc +++ b/pcsx2/SPU2/Windows/SPU2.rc @@ -7,6 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // +#include "svnrev.h" #include "afxresmw.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -33,8 +34,6 @@ BEGIN GROUPBOX "Mixing Settings",IDC_STATIC,3,5,154,115 LTEXT "Interpolation:",IDC_STATIC,9,16,61,10,NOT WS_GROUP COMBOBOX IDC_INTERPOLATE,9,26,145,84,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CHECKBOX "Disable Effects Processing",IDC_EFFECTS_DISABLE,11,47,126,10 - LTEXT "(speedup!) Skips reverb effects processing, but won't sound as good in most games.",IDC_STATIC,23,59,110,36 CONTROL "Use the de-alias filter",IDC_DEALIASFILTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,92,126,10 LTEXT "(overemphasizes the highs)",IDC_STATIC,23,104,114,12,NOT WS_GROUP GROUPBOX "",IDC_STATIC,3,124,154,45 @@ -145,11 +144,8 @@ BEGIN IDD_CONFIG, DIALOG BEGIN LEFTMARGIN, 6 - RIGHTMARGIN, 314 VERTGUIDE, 218 VERTGUIDE, 282 - BOTTOMMARGIN, 292 - HORZGUIDE, 268 END IDD_DEBUG, DIALOG diff --git a/pcsx2/SPU2/Windows/resource.h b/pcsx2/SPU2/Windows/resource.h index 05c6e9ece8..b15d41c02d 100644 --- a/pcsx2/SPU2/Windows/resource.h +++ b/pcsx2/SPU2/Windows/resource.h @@ -7,7 +7,6 @@ #define IDD_CONFIG_SOUNDTOUCH 117 #define IDD_CONFIG_DEBUG 118 #define IDD_PORTAUDIO 119 -#define IDC_EFFECTS_DISABLE 1001 #define IDC_DUMPREGS 1003 #define IDC_DUMPMEM 1004 #define IDC_DUMPCORE 1005