diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index b70c98de09..b5d9a1e0e2 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -299,7 +299,6 @@ PrefsManager::PrefsManager() : m_iSoundDevice ( "SoundDevice", "" ), m_iSoundPreferredSampleRate ( "SoundPreferredSampleRate", 44100 ), m_sInputDrivers ( "InputDrivers", "" ), - m_sMovieDrivers ( "MovieDrivers", "" ), m_sLightsStepsDifficulty ( "LightsStepsDifficulty", "medium" ), m_bBlinkGameplayButtonLightsOnNote ( "BlinkGameplayButtonLightsOnNote",false ), m_bAllowUnacceleratedRenderer ( "AllowUnacceleratedRenderer", false ), @@ -522,14 +521,6 @@ CString PrefsManager::GetInputDrivers() { return m_sInputDrivers; } -CString PrefsManager::GetMovieDrivers() -{ - if ( m_sMovieDrivers.Get().empty() ) - return (CString)DEFAULT_MOVIE_DRIVER_LIST; - else - return m_sMovieDrivers; -} - bool PrefsManager::MessageIsIgnored( const CString &ID ) { vector list; diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 787aa54787..047c894b55 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -227,7 +227,6 @@ public: private: Preference m_sInputDrivers; // "" == default public: - Preference m_sMovieDrivers; // "" == default Preference m_sLightsStepsDifficulty; Preference m_bBlinkGameplayButtonLightsOnNote; Preference m_bAllowUnacceleratedRenderer; @@ -258,7 +257,6 @@ public: CString GetSoundDrivers(); float GetSoundVolume(); CString GetInputDrivers(); - CString GetMovieDrivers(); void ReadPrefsFromIni( const IniFile &ini, const CString &sSection ); diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp index f53f28d316..78c851c792 100644 --- a/stepmania/src/arch/arch.cpp +++ b/stepmania/src/arch/arch.cpp @@ -10,6 +10,7 @@ #include "arch_platform.h" #include "Foreach.h" #include "LocalizedString.h" +#include "arch/arch_default.h" #include "InputHandler/Selector_InputHandler.h" static LocalizedString INPUT_HANDLERS_EMPTY( "Arch", "Input Handlers cannot be empty." ); @@ -176,6 +177,7 @@ MemoryCardDriver *MakeMemoryCardDriver() return ret; } +static Preference g_sMovieDrivers( "MovieDrivers", "" ); // "" == default #include "MovieTexture/Selector_MovieTexture.h" static void DumpAVIDebugInfo( const CString& fn ); /* Try drivers in order of preference until we find one that works. */ @@ -185,8 +187,12 @@ RageMovieTexture *MakeRageMovieTexture( RageTextureID ID ) { DumpAVIDebugInfo( ID.filename ); + RString sDrivers = g_sMovieDrivers; + if( sDrivers.empty() ) + sDrivers = DEFAULT_MOVIE_DRIVER_LIST; + vector DriversToTry; - split( PREFSMAN->GetMovieDrivers(), ",", DriversToTry, true ); + split( sDrivers, ",", DriversToTry, true ); if( DriversToTry.empty() ) RageException::Throw( MOVIE_DRIVERS_EMPTY.GetValue() );