actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move some stuff out of arch.cpp, so arch drivers aren't all cross-dependent

Browse Source
This commit is contained in:
Glenn Maynard
2004-07-07 20:11:30 +00:00
parent f62ed09cd3
commit e47f331924
6 changed files with 101 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Lights/LightsDriver.cpp
+50
View File
@@ -0,0 +1,50 @@
#include "global.h"
#include "LightsDriver.h"
#include "RageLog.h"
#include "arch/arch.h"
#include "arch/arch_platform.h"
LightsDriver *MakeLightsDriver(CString driver)
{
LOG->Trace("Initializing lights driver: %s", driver.c_str());
LightsDriver *ret = NULL;
#ifdef _WINDOWS
if(!driver.CompareNoCase("Parallel")) ret = new LightsDriver_Win32Parallel;
#endif
if(!driver.CompareNoCase("SystemMessage")) ret = new LightsDriver_SystemMessage;
if(!driver.CompareNoCase("Null") || !ret )
{
if( driver.CompareNoCase("Null") )
LOG->Warn("Unknown lights driver name: %s", driver.c_str());
ret = new LightsDriver_Null;
}
return ret;
}
/*
* (c) 2002-2004 Glenn Maynard
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons to
* whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
stepmania/src/arch/Lights/LightsDriver.h
+1
View File
@@ -16,6 +16,7 @@ public:
virtual void Set( const LightsState *ls ) = 0;
};
LightsDriver *MakeLightsDriver( CString driver );
#endif
stepmania/src/arch/MemoryCard/MemoryCardDriver.cpp
+48
View File
@@ -0,0 +1,48 @@
#include "global.h"
#include "MemoryCardDriver.h"
#include "PrefsManager.h"
#include "arch/arch_platform.h"
MemoryCardDriver *MakeMemoryCardDriver()
{
if( !PREFSMAN->m_bMemoryCards )
return new MemoryCardDriver_Null;
MemoryCardDriver *ret = NULL;
#ifdef LINUX
ret = new MemoryCardDriverThreaded_Linux;
#elif _WINDOWS
ret = new MemoryCardDriverThreaded_Windows;
#endif
if( !ret )
ret = new MemoryCardDriver_Null;
return ret;
}
/*
* (c) 2002-2004 Glenn Maynard
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons to
* whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
stepmania/src/arch/MemoryCard/MemoryCardDriver.h
+2
View File
@@ -61,6 +61,8 @@ public:
virtual void UnPauseMountingThread() = 0;
};
MemoryCardDriver *MakeMemoryCardDriver();
#endif
/*
stepmania/src/arch/arch.cpp
-38
View File
@@ -127,44 +127,6 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers)
return ret;
}
LightsDriver *MakeLightsDriver(CString driver)
{
LOG->Trace("Initializing lights driver: %s", driver.c_str());
LightsDriver *ret = NULL;
#ifdef _WINDOWS
if(!driver.CompareNoCase("Parallel")) ret = new LightsDriver_Win32Parallel;
#endif
if(!driver.CompareNoCase("SystemMessage")) ret = new LightsDriver_SystemMessage;
if(!driver.CompareNoCase("Null") || !ret )
{
if( driver.CompareNoCase("Null") )
LOG->Warn("Unknown lights driver name: %s", driver.c_str());
ret = new LightsDriver_Null;
}
return ret;
}
MemoryCardDriver *MakeMemoryCardDriver()
{
if( !PREFSMAN->m_bMemoryCards )
return new MemoryCardDriver_Null;
MemoryCardDriver *ret = NULL;
#ifdef LINUX
ret = new MemoryCardDriverThreaded_Linux;
#elif _WINDOWS
ret = new MemoryCardDriverThreaded_Windows;
#endif
if( !ret )
ret = new MemoryCardDriver_Null;
return ret;
}
/*
* (c) 2002-2004 Glenn Maynard
* All rights reserved.
stepmania/src/arch/arch.h
-2
View File
@@ -15,8 +15,6 @@ LowLevelWindow *MakeLowLevelWindow();
void MakeInputHandlers(vector<InputHandler *> &Add);
RageSoundDriver *MakeRageSoundDriver(CString drivers);
LightsDriver *MakeLightsDriver(CString driver);
MemoryCardDriver *MakeMemoryCardDriver();
/* These definitions are in here, instead of in arch_*.h, because they
* need to be available to other modules. It'd be overkill to create separate