spu2-x: Some changes to how the ini file writing works in Linux. (still buggy)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3072 96395faa-99c1-11dd-bbfe-3dabce05a288

plugins/spu2-x/src/Linux/CfgHelpers.cpp

@@ -19,63 +19,53 @@
  #include <wx/fileconf.h>
 
  wxConfigBase *oldConfig;
- wxString path;
+ wxFileConfig *spuConfig;
+ wxString path(L"~/.pcsx2/inis/spu2-x.ini");
+ bool pathSet = false;
 
- wxFileConfig *setIni(const wchar_t* Section)
+void initIni()
 {
- 	wxConfig *tempConfig;
+	spuConfig = new wxFileConfig(L"", L"", path, L"", wxCONFIG_USE_LOCAL_FILE);
-
-	oldConfig = wxConfigBase::Get(false);
-
-	tempConfig = new wxFileConfig(L"", L"", path, L"", wxCONFIG_USE_LOCAL_FILE);
-	wxConfigBase::Set(tempConfig);
-	tempConfig->SetPath(L"/");
-	tempConfig->SetPath(Section);
-	return tempConfig;
 }
 
- void writeIni(wxFileConfig *tempConfig)
+void setIni(const wchar_t* Section)
  {
- 	tempConfig->Flush();
+	if (spuConfig == NULL) initIni();
-
+	spuConfig->SetPath(wxsFormat(L"/%s", Section));
-	if (oldConfig != NULL) wxConfigBase::Set(oldConfig);
-	delete tempConfig;
  }
 
 void CfgSetSettingsDir(const char* dir)
 {
-	path = wxString::FromAscii(dir) + L"spu2-x.ini";
+	FileLog("CfgSetSettingsDir(%s)\n", dir);
-
+	path = wxString::FromAscii(dir) + L"/spu2-x.ini";
+	pathSet = true;
+	initIni();
 }
 
 void CfgWriteBool(const wchar_t* Section, const wchar_t* Name, bool Value)
 {
-	wxConfig *config = setIni(Section);
+	setIni(Section);
-	config->Write(Name, Value);
+	spuConfig->Write(Name, Value);
-	writeIni(config);
 }
 
 void CfgWriteInt(const wchar_t* Section, const wchar_t* Name, int Value)
 {
-	wxConfig *config = setIni(Section);
+	setIni(Section);
-	config->Write(Name, Value);
+	spuConfig->Write(Name, Value);
-	writeIni(config);
 }
 
 void CfgWriteStr(const wchar_t* Section, const wchar_t* Name, const wstring& Data)
 {
-	wxConfig *config = setIni(Section);
+	setIni(Section);
-	config->Write(Name, Data);
+	spuConfig->Write(Name, Data);
-	writeIni(config);
 }
 
 bool CfgReadBool(const wchar_t *Section,const wchar_t* Name, bool Default)
 {
 	bool ret;
 
-	wxConfig *config = setIni(Section);
+	setIni(Section);
-	config->Read(Name, &ret, Default);
+	spuConfig->Read(Name, &ret, Default);
-	writeIni(config);
 
 	return ret;
 }
@@ -84,25 +74,22 @@ int CfgReadInt(const wchar_t* Section, const wchar_t* Name,int Default)
 {
 	int ret;
 
-	wxConfig *config = setIni(Section);
+	setIni(Section);
-	config->Read(Name, &ret, Default);
+	spuConfig->Read(Name, &ret, Default);
-	writeIni(config);
 
 	return ret;
 }
 
 void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wchar_t* Data, int DataSize, const wchar_t* Default)
 {
-	wxConfig *config = setIni(Section);
+	setIni(Section);
-	wcscpy(Data, config->Read(Name, Default));
+	wcscpy(Data, spuConfig->Read(Name, Default));
-	writeIni(config);
 }
 
 void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wxString& Data, int DataSize, const wchar_t* Default)
 {
-	wxConfig *config = setIni(Section);
+	setIni(Section);
-	Data = config->Read(Name, Default);
+	Data = spuConfig->Read(Name, Default);
-	writeIni(config);
 }
 
 void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wstring& Data, int DataSize, const wchar_t* Default)

plugins/spu2-x/src/Linux/Config.cpp

@@ -54,6 +54,14 @@ bool asyncMixingEnabled = false;
 
 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;
+	}
+	
 	Interpolation = CfgReadInt( L"MIXING",L"Interpolation", 1 );
 	EffectsDisabled = CfgReadBool( L"MIXING", L"Disable_Effects", false );
 	ReverbBoost = CfgReadInt( L"MIXING",L"Reverb_Boost", 0 );
@@ -76,12 +84,19 @@ void ReadSettings()
 	Clampify( SndOutLatencyMS, LATENCY_MIN, LATENCY_MAX );
 
 	WriteSettings();
+	spuConfig->Flush();
 }
 
 /*****************************************************************************/
 
 void WriteSettings()
 {
+	if (!pathSet) 
+	{
+		FileLog("Write called without the path set.\n");
+		return;
+	}
+	
 	CfgWriteInt(L"MIXING",L"Interpolation",Interpolation);
 	CfgWriteBool(L"MIXING",L"Disable_Effects",EffectsDisabled);
 	CfgWriteInt(L"MIXING",L"Reverb_Boost",ReverbBoost);

plugins/spu2-x/src/Linux/Config.h

@@ -20,6 +20,7 @@
 
 #include <gtk/gtk.h>
 #include <string>
+#include <wx/fileconf.h>
 
 extern bool DebugEnabled;
 
@@ -109,5 +110,6 @@ void ReadSettings();
 void WriteSettings();
 void configure();
 void AboutBox();
-
+extern wxFileConfig *spuConfig;
+extern bool pathSet;
 #endif // CONFIG_H_INCLUDED

plugins/spu2-x/src/Linux/SPU2-X.cbp

@@ -13,6 +13,7 @@
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
+					<Add option="-DPCSX2_DEVBUILD" />
 				</Compiler>
 				<Linker>
 					<Add library="../../../../deps/debug/libsoundtouch-dbg.a" />