Make a few settings in spu2-x stick under Linux. The whole config sec…

…tion should probably be rewritten, but that's for a later date.
PCSX2 · Sep 3, 2020 · a1d6cb2 · a1d6cb2
1 parent 19f153a
commit a1d6cb2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/plugins/spu2-x/src/Linux/Config.cpp b/plugins/spu2-x/src/Linux/Config.cpp
@@ -153,6 +153,7 @@ void ReadSettings()
 
     SndOutLatencyMS = CfgReadInt(L"OUTPUT", L"Latency", 300);
     SynchMode = CfgReadInt(L"OUTPUT", L"Synch_Mode", 0);
+    numSpeakers = CfgReadInt(L"OUTPUT", L"SpeakerConfiguration", 0);
 
 #ifdef SPU2X_PORTAUDIO
     PortaudioOut->ReadSettings();
@@ -205,6 +206,7 @@ void WriteSettings()
     CfgWriteStr(L"OUTPUT", L"Output_Module", mods[OutputModule]->GetIdent());
     CfgWriteInt(L"OUTPUT", L"Latency", SndOutLatencyMS);
     CfgWriteInt(L"OUTPUT", L"Synch_Mode", SynchMode);
+    CfgWriteInt(L"OUTPUT", L"SpeakerConfiguration", numSpeakers);
     CfgWriteInt(L"DEBUG", L"DelayCycles", delayCycles);
 
 #ifdef SPU2X_PORTAUDIO

diff --git a/plugins/spu2-x/src/wx/wxConfig.cpp b/plugins/spu2-x/src/wx/wxConfig.cpp
@@ -245,10 +245,18 @@ void Dialog::SaveValues()
 {
     Interpolation = m_inter_select->GetSelection();
     OutputModule = m_module_select->GetSelection();
+
 #ifdef SPU2X_PORTAUDIO
     OutputAPI = m_portaudio_select->GetSelection();
+    wxString p_api(m_portaudio_select->GetStringSelection());
+    if (p_api.Find("ALSA") != wxNOT_FOUND) p_api = "ALSA";
+    if (p_api.Find("OSS") != wxNOT_FOUND) p_api = "OSS";
+    PortaudioOut->SetApiSettings(p_api);
 #endif
+
     SdlOutputAPI = m_sdl_select->GetSelection();
+    SDLOut->SetApiSettings(m_sdl_select->GetStringSelection());
+
     SynchMode = m_sync_select->GetSelection();
     numSpeakers = m_audio_select->GetSelection();