From 250b70fcae99ee9d329ec7246f4754bb4ac32b70 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 2 Sep 2003 04:52:00 +0000 Subject: [PATCH] Add MovieDrivers preference. Move DEFAULT_MOVIE_DRIVER_LIST to arch.cpp. --- stepmania/src/arch/MovieTexture/MovieTexture.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/stepmania/src/arch/MovieTexture/MovieTexture.cpp b/stepmania/src/arch/MovieTexture/MovieTexture.cpp index 4f277a26b7..c819a3d6c9 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture.cpp +++ b/stepmania/src/arch/MovieTexture/MovieTexture.cpp @@ -3,6 +3,7 @@ #include "RageUtil.h" #include "RageLog.h" #include "MovieTexture_Null.h" +#include "PrefsManager.h" /* Why is this _WINDOWS and not WIN32? * --steve @@ -12,9 +13,6 @@ #if defined(_WINDOWS) #include "MovieTexture_DShow.h" #define HAVE_FFMPEG -#define DEFAULT_MOVIE_DRIVER_LIST "FFMpeg,DShow,Null" -#else /* config.h */ -#define DEFAULT_MOVIE_DRIVER_LIST "FFMpeg,Null" #endif #ifdef HAVE_FFMPEG @@ -78,7 +76,7 @@ RageMovieTexture *MakeRageMovieTexture(RageTextureID ID) DumpAVIDebugInfo( ID.filename ); CStringArray DriversToTry; - split(DEFAULT_MOVIE_DRIVER_LIST, ",", DriversToTry, true); + split(PREFSMAN->m_sMovieDrivers, ",", DriversToTry, true); ASSERT(DriversToTry.size() != 0); CString Driver;