From 9754852418adcfa3335b96ce04cc997ca9bbf672 Mon Sep 17 00:00:00 2001
From: Charles Lohr <cnlohr@users.sourceforge.net>
Date: Mon, 16 May 2005 18:07:01 +0000
Subject: [PATCH] Fix compile for VC6

---
 stepmania/src/PrefsManager.cpp | 42 ++++++++++++++++++++++++++++++----
 stepmania/src/PrefsManager.h   |  2 +-
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 43f6531750..f637d78c25 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -380,11 +380,43 @@ void PrefsManager::SaveGlobalPrefsToIni( IniFile &ini ) const
 }
 
 // wrappers
-CString PrefsManager::GetSoundDrivers()	{ return m_sSoundDrivers.Get().empty() ? (CString)DEFAULT_SOUND_DRIVER_LIST : m_sSoundDrivers; }
-float PrefsManager::GetSoundVolume()	{ return m_fSoundVolume==-1 ? DEFAULT_SOUND_VOLUME : m_fSoundVolume; }
-CString PrefsManager::GetInputDrivers()	{ return m_sInputDrivers.Get().empty() ? (CString)DEFAULT_INPUT_DRIVER_LIST : m_sInputDrivers; }
-CString PrefsManager::GetMovieDrivers()	{ return m_sMovieDrivers.Get().empty() ? (CString)DEFAULT_MOVIE_DRIVER_LIST : m_sMovieDrivers; }
-CString PrefsManager::GetLightsDriver()	{ return m_sLightsDriver.Get().empty() ? (CString)DEFAULT_LIGHTS_DRIVER : m_sLightsDriver; }
+CString PrefsManager::GetSoundDrivers()	
+{
+	if ( m_sSoundDrivers.Get().empty() )
+		return (CString)DEFAULT_SOUND_DRIVER_LIST;
+	else
+		return m_sSoundDrivers;
+}
+
+float PrefsManager::GetSoundVolume()
+{
+	if ( m_fSoundVolume==-1 )
+		return DEFAULT_SOUND_VOLUME;
+	else
+		return m_fSoundVolume; 
+}
+
+CString PrefsManager::GetInputDrivers()	{
+	if( m_sInputDrivers.Get().empty() )
+		return (CString)DEFAULT_INPUT_DRIVER_LIST;
+	else
+		return m_sInputDrivers;
+}
+
+CString PrefsManager::GetMovieDrivers()
+{ 
+	if ( m_sMovieDrivers.Get().empty() )
+		return (CString)DEFAULT_MOVIE_DRIVER_LIST;
+	else
+		return m_sMovieDrivers; 
+}
+
+CString PrefsManager::GetLightsDriver()	{ 
+	if ( m_sLightsDriver.Get().empty() )
+		return (CString)DEFAULT_LIGHTS_DRIVER;
+	else
+		return m_sLightsDriver;
+}
 
 
 // lua start
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index a3c22ef4e7..2c80a7d3d5 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -295,9 +295,9 @@ public:
 	Preference<RageSoundReader_Resample::ResampleQuality>	m_SoundResampleQuality;
 private:
 	Preference<CString>	m_sInputDrivers;	// "" == default
-	Preference<CString>	m_sMovieDrivers;	// "" == default
 	Preference<CString>	m_sLightsDriver;	// "" == default
 public:
+	Preference<CString>	m_sMovieDrivers;	// "" == default
 	Preference<CString>	m_sLightsStepsDifficulty;
 	Preference<bool>	m_bBlinkGameplayButtonLightsOnNote;
 	Preference<bool>	m_bAllowUnacceleratedRenderer;