mirror of https://github.com/PCSX2/pcsx2.git
SPU2: linux fix where config wasn't setup on init & savestate bump
This commit is contained in:
parent
1e7b69b1ab
commit
b11ad72473
|
@ -23,9 +23,9 @@ bool pathSet = false;
|
|||
|
||||
void initIni()
|
||||
{
|
||||
if(!pathSet)
|
||||
if (!pathSet)
|
||||
{
|
||||
path = GetSettingsFolder().Combine( path ).GetFullPath();
|
||||
path = GetSettingsFolder().Combine(path).GetFullPath();
|
||||
pathSet = true;
|
||||
}
|
||||
if (spuConfig == nullptr)
|
||||
|
|
|
@ -82,10 +82,7 @@ void ReadSettings()
|
|||
// For some reason this can be called before we know what ini file we're writing to.
|
||||
// Lets not try to read it if that happens.
|
||||
if (!pathSet)
|
||||
{
|
||||
FileLog("Read called without the path set.\n");
|
||||
return;
|
||||
}
|
||||
initIni();
|
||||
|
||||
Interpolation = CfgReadInt(L"MIXING", L"Interpolation", 4);
|
||||
EffectsDisabled = CfgReadBool(L"MIXING", L"Disable_Effects", false);
|
||||
|
|
|
@ -86,7 +86,7 @@ SndOutModule* mods[] =
|
|||
XAudio2Out,
|
||||
WaveOut,
|
||||
#endif
|
||||
#if defined(SPU2X_PORTAUDIO)
|
||||
#if defined(SPU2X_PORTAUDIO)
|
||||
PortaudioOut,
|
||||
#endif
|
||||
#if defined(__linux__) /* && defined(__ALSA__)*/
|
||||
|
|
|
@ -193,7 +193,7 @@ void WriteSettings()
|
|||
CfgWriteInt(L"DSP PLUGIN", L"ModuleNum", dspPluginModule);
|
||||
CfgWriteBool(L"DSP PLUGIN", L"Enabled", dspPluginEnabled);
|
||||
|
||||
PortaudioOut->WriteSettings();
|
||||
PortaudioOut->WriteSettings();
|
||||
SoundtouchCfg::WriteSettings();
|
||||
DebugConfig::WriteSettings();
|
||||
}
|
||||
|
@ -206,7 +206,7 @@ void CheckOutputModule(HWND window)
|
|||
mods[OutputModule] == WaveOut;
|
||||
|
||||
const bool AudioExpansion =
|
||||
mods[OutputModule] == XAudio2Out ||
|
||||
mods[OutputModule] == XAudio2Out ||
|
||||
mods[OutputModule] == PortaudioOut;
|
||||
|
||||
EnableWindow(GetDlgItem(window, IDC_OUTCONF), IsConfigurable);
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#include "Dma.h"
|
||||
#ifdef __linux__
|
||||
#include "Linux/Dialogs.h"
|
||||
#include "Linux/Config.h"
|
||||
#elif defined(_WIN32)
|
||||
#include "Windows/Dialogs.h"
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue