move out of PrefsMan

This commit is contained in:
Glenn Maynard
2006-03-26 04:12:17 +00:00
parent f93db25802
commit d37daab68c
3 changed files with 3 additions and 4 deletions
+3 -2
View File
@@ -12,7 +12,6 @@
#include "RageUtil_WorkerThread.h"
#include "arch/arch.h"
#include "arch/MemoryCard/MemoryCardDriver_Null.h"
#include "PrefsManager.h"
MemoryCardManager* MEMCARDMAN = NULL; // global and accessable from anywhere in our program
@@ -40,6 +39,8 @@ static void MemoryCardUsbLevelInit( size_t /*PlayerNumber*/ i, RString &sNameOut
defaultValueOut = -1;
}
static Preference<bool> g_bMemoryCards( "MemoryCards", true );
// if set, always use the device that mounts to this point
Preference1D<RString> MemoryCardManager::m_sMemoryCardOsMountPoint( MemoryCardOsMountPointInit, NUM_PLAYERS );
// Look for this level, bus, port when assigning cards. -1 = match any
@@ -136,7 +137,7 @@ ThreadedMemoryCardWorker::ThreadedMemoryCardWorker( bool bInEditScreens ):
RageWorkerThread("MemoryCardWorker"),
UsbStorageDevicesMutex("UsbStorageDevicesMutex")
{
if( PREFSMAN->m_bMemoryCards || bInEditScreens )
if( g_bMemoryCards || bInEditScreens )
m_pDriver = MakeMemoryCardDriver();
else
m_pDriver = new MemoryCardDriver_Null;