summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Src/VideoConfig.cpp
diff options
context:
space:
mode:
authorhrydgard <hrydgard@gmail.com>2009-09-13 10:18:01 +0000
committerhrydgard <hrydgard@gmail.com>2009-09-13 10:18:01 +0000
commit73d2b3e9684da5eb43280b7facbf2f31d584a75b (patch)
tree5ab368e37a1eefb2f2153b9dbf01afef1cd155e1 /Source/Core/VideoCommon/Src/VideoConfig.cpp
parent2d93c654f09e86b00a14b0929f07089c137bcc05 (diff)
more uninteresting cleanup, fixed a minor race condition when toggling efb copy mode
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4261 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon/Src/VideoConfig.cpp')
-rw-r--r--Source/Core/VideoCommon/Src/VideoConfig.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
index 4c171f1db3..e95503a2f8 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp
@@ -22,20 +22,20 @@
#include "VideoConfig.h"
#include "VideoCommon.h"
-Config g_Config;
-Config g_ActiveConfig;
+VideoConfig g_Config;
+VideoConfig g_ActiveConfig;
void UpdateActiveConfig()
{
g_ActiveConfig = g_Config;
}
-Config::Config()
+VideoConfig::VideoConfig()
{
bRunning = false;
}
-void Config::Load(const char *ini_file)
+void VideoConfig::Load(const char *ini_file)
{
std::string temp;
IniFile iniFile;
@@ -105,7 +105,7 @@ void Config::Load(const char *ini_file)
SetEnableAlert(bTmp);
}
-void Config::GameIniLoad(const char *ini_file)
+void VideoConfig::GameIniLoad(const char *ini_file)
{
IniFile iniFile;
iniFile.Load(ini_file);
@@ -121,7 +121,7 @@ void Config::GameIniLoad(const char *ini_file)
iniFile.Get("Video", "ProjectionHack", &iPhackvalue, 0);
}
-void Config::Save(const char *ini_file)
+void VideoConfig::Save(const char *ini_file)
{
IniFile iniFile;
iniFile.Load(ini_file);