Move fullscreen display resolution control to the GUI with the rest of the fullscreen toggling code. This removes redundancy of code that was in several places through the various video plugins. Unfortunately it means the fullscreen resolution setting also had to be moved to the main configuration dialog. I am sure that will meet some resistance.

Also added a window size setting for windowed mode.

Also pulled some X11 specific code out into a separate file.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5395 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 0 insertions, 8 deletions

diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
index cecd8a3de3..11364e3808 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp
@@ -47,10 +47,6 @@ void VideoConfig::Load(const char *ini_file)
     IniFile iniFile;
     iniFile.Load(ini_file);
 
-	// get resolution
-	iniFile.Get("Hardware", "FullscreenRes", &temp, "640x480");
-    strncpy(cFSResolution, temp.c_str(), 16);
-    
     iniFile.Get("Hardware", "VSync", &bVSync, 0); // Hardware
     iniFile.Get("Settings", "StretchToFit", &bNativeResolution, true);
 	iniFile.Get("Settings", "2xResolution", &b2xResolution, false);
@@ -151,7 +147,6 @@ void VideoConfig::Save(const char *ini_file)
 {
     IniFile iniFile;
     iniFile.Load(ini_file);
-    iniFile.Set("Hardware", "FullscreenRes", cFSResolution);
     iniFile.Set("Hardware", "VSync", bVSync);
     iniFile.Set("Settings", "StretchToFit", bNativeResolution);
 	iniFile.Set("Settings", "2xResolution", b2xResolution);
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h
index 462b18e271..75d39f9afa 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.h
+++ b/Source/Core/VideoCommon/Src/VideoConfig.h
@@ -69,9 +69,6 @@ struct VideoConfig
     // General
 	bool bVSync;
 
-	// Resolution control
-	char cFSResolution[16];
-
     bool bNativeResolution, b2xResolution, bRunning;  // Should possibly be augmented with 2x, 4x native.
 	bool bWidescreenHack;
 	int iAspectRatio;