Merge pull request #500 from lioncash/ini

Use only section-based ini reading.

1 files changed, 46 insertions, 36 deletions

diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp
index 091eab35fa..0e4338eb84 100644
--- a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp
+++ b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp
@@ -38,24 +38,29 @@ void SWVideoConfig::Load(const char* ini_file)
 	IniFile iniFile;
 	iniFile.Load(ini_file);
 
-	iniFile.Get("Hardware", "Fullscreen", &bFullscreen, 0); // Hardware
-	iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false);
-
-	iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, false);
-	iniFile.Get("Rendering", "BypassXFB", &bBypassXFB, false);
-	iniFile.Get("Rendering", "ZComploc", &bZComploc, true);
-	iniFile.Get("Rendering", "ZFreeze", &bZFreeze, true);
-
-	iniFile.Get("Info", "ShowStats", &bShowStats, false);
-
-	iniFile.Get("Utility", "DumpTexture", &bDumpTextures, false);
-	iniFile.Get("Utility", "DumpObjects", &bDumpObjects, false);
-	iniFile.Get("Utility", "DumpFrames", &bDumpFrames, false);
-	iniFile.Get("Utility", "DumpTevStages", &bDumpTevStages, false);
-	iniFile.Get("Utility", "DumpTevTexFetches", &bDumpTevTextureFetches, false);
-
-	iniFile.Get("Misc", "DrawStart", &drawStart, 0);
-	iniFile.Get("Misc", "DrawEnd", &drawEnd, 100000);
+	IniFile::Section* hardware = iniFile.GetOrCreateSection("Hardware");
+	hardware->Get("Fullscreen", &bFullscreen, 0); // Hardware
+	hardware->Get("RenderToMainframe", &renderToMainframe, false);
+
+	IniFile::Section* rendering = iniFile.GetOrCreateSection("Rendering");
+	rendering->Get("HwRasterizer", &bHwRasterizer, false);
+	rendering->Get("BypassXFB", &bBypassXFB, false);
+	rendering->Get("ZComploc", &bZComploc, true);
+	rendering->Get("ZFreeze", &bZFreeze, true);
+
+	IniFile::Section* info = iniFile.GetOrCreateSection("Info");
+	info->Get("ShowStats", &bShowStats, false);
+
+	IniFile::Section* utility = iniFile.GetOrCreateSection("Utility");
+	utility->Get("DumpTexture", &bDumpTextures, false);
+	utility->Get("DumpObjects", &bDumpObjects, false);
+	utility->Get("DumpFrames", &bDumpFrames, false);
+	utility->Get("DumpTevStages", &bDumpTevStages, false);
+	utility->Get("DumpTevTexFetches", &bDumpTevTextureFetches, false);
+
+	IniFile::Section* misc = iniFile.GetOrCreateSection("Misc");
+	misc->Get("DrawStart", &drawStart, 0);
+	misc->Get("DrawEnd", &drawEnd, 100000);
 }
 
 void SWVideoConfig::Save(const char* ini_file)
@@ -63,24 +68,29 @@ void SWVideoConfig::Save(const char* ini_file)
 	IniFile iniFile;
 	iniFile.Load(ini_file);
 
-	iniFile.Set("Hardware", "Fullscreen", bFullscreen);
-	iniFile.Set("Hardware", "RenderToMainframe", renderToMainframe);
-
-	iniFile.Set("Rendering", "HwRasterizer", bHwRasterizer);
-	iniFile.Set("Rendering", "BypassXFB", bBypassXFB);
-	iniFile.Set("Rendering", "ZComploc", bZComploc);
-	iniFile.Set("Rendering", "ZFreeze", bZFreeze);
-
-	iniFile.Set("Info", "ShowStats", bShowStats);
-
-	iniFile.Set("Utility", "DumpTexture", bDumpTextures);
-	iniFile.Set("Utility", "DumpObjects", bDumpObjects);
-	iniFile.Set("Utility", "DumpFrames", bDumpFrames);
-	iniFile.Set("Utility", "DumpTevStages", bDumpTevStages);
-	iniFile.Set("Utility", "DumpTevTexFetches", bDumpTevTextureFetches);
-
-	iniFile.Set("Misc", "DrawStart", drawStart);
-	iniFile.Set("Misc", "DrawEnd", drawEnd);
+	IniFile::Section* hardware = iniFile.GetOrCreateSection("Hardware");
+	hardware->Set("Fullscreen", bFullscreen);
+	hardware->Set("RenderToMainframe", renderToMainframe);
+
+	IniFile::Section* rendering = iniFile.GetOrCreateSection("Rendering");
+	rendering->Set("HwRasterizer", bHwRasterizer);
+	rendering->Set("BypassXFB", bBypassXFB);
+	rendering->Set("ZComploc", bZComploc);
+	rendering->Set("ZFreeze", bZFreeze);
+
+	IniFile::Section* info = iniFile.GetOrCreateSection("Info");
+	info->Set("ShowStats", bShowStats);
+
+	IniFile::Section* utility = iniFile.GetOrCreateSection("Utility");
+	utility->Set("DumpTexture", bDumpTextures);
+	utility->Set("DumpObjects", bDumpObjects);
+	utility->Set("DumpFrames", bDumpFrames);
+	utility->Set("DumpTevStages", bDumpTevStages);
+	utility->Set("DumpTevTexFetches", bDumpTevTextureFetches);
+
+	IniFile::Section* misc = iniFile.GetOrCreateSection("Misc");
+	misc->Set("DrawStart", drawStart);
+	misc->Set("DrawEnd", drawEnd);
 
 	iniFile.Save(ini_file);
 }