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

Style.

Browse Source
This commit is contained in:
Steve Checkoway
2006-01-22 00:40:53 +00:00
parent 1e8ccdeda4
commit d10e652b97
2 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/arch.cpp
+41 -42
View File
@@ -14,10 +14,10 @@
#include "InputHandler/Selector_InputHandler.h"
static LocalizedString INPUT_HANDLERS_EMPTY( "Arch", "Input Handlers cannot be empty." );
void MakeInputHandlers(CString drivers, vector<InputHandler *> &Add)
void MakeInputHandlers( CString drivers, vector<InputHandler *> &Add )
{
vector<CString> DriversToTry;
split(drivers, ",", DriversToTry, true);
split( drivers, ",", DriversToTry, true );
if( DriversToTry.empty() )
RageException::Throw( INPUT_HANDLERS_EMPTY.GetValue() );
@@ -29,34 +29,34 @@ void MakeInputHandlers(CString drivers, vector<InputHandler *> &Add)
InputHandler *ret = NULL;
#ifdef USE_INPUT_HANDLER_DIRECTINPUT
if(!s->CompareNoCase("DirectInput") ) ret = new InputHandler_DInput;
if( !s->CompareNoCase("DirectInput") ) ret = new InputHandler_DInput;
#endif
#ifdef USE_INPUT_HANDLER_LINUX_JOYSTICK
if(!s->CompareNoCase("Joystick") ) ret = new InputHandler_Linux_Joystick;
if( !s->CompareNoCase("Joystick") ) ret = new InputHandler_Linux_Joystick;
#endif
#ifdef USE_INPUT_HANDLER_LINUX_TTY
if(!s->CompareNoCase("tty") ) ret = new InputHandler_Linux_tty;
if( !s->CompareNoCase("tty") ) ret = new InputHandler_Linux_tty;
#endif
#ifdef USE_INPUT_HANDLER_SDL
if(!s->CompareNoCase("SDL") ) ret = new InputHandler_SDL;
if( !s->CompareNoCase("SDL") ) ret = new InputHandler_SDL;
#endif
#ifdef USE_INPUT_HANDLER_WIN32_PARA
if(!s->CompareNoCase("Para") ) ret = new InputHandler_Win32_Para;
if( !s->CompareNoCase("Para") ) ret = new InputHandler_Win32_Para;
#endif
#ifdef USE_INPUT_HANDLER_WIN32_PUMP
if(!s->CompareNoCase("Pump") ) ret = new InputHandler_Win32_Pump;
if( !s->CompareNoCase("Pump") ) ret = new InputHandler_Win32_Pump;
#endif
#ifdef USE_INPUT_HANDLER_WIN32_MIDI
if(!s->CompareNoCase("MIDI") ) ret = new InputHandler_Win32_MIDI;
if( !s->CompareNoCase("MIDI") ) ret = new InputHandler_Win32_MIDI;
#endif
#ifdef USE_INPUT_HANDLER_X11
if(!s->CompareNoCase("X11") ) ret = new InputHandler_X11;
if( !s->CompareNoCase("X11") ) ret = new InputHandler_X11;
#endif
#ifdef USE_INPUT_HANDLER_XBOX
if(!s->CompareNoCase("Xbox") ) ret = new InputHandler_Xbox;
if( !s->CompareNoCase("Xbox") ) ret = new InputHandler_Xbox;
#endif
#ifdef USE_INPUT_HANDLER_CARBON
if(!s->CompareNoCase("Carbon") ) ret = new InputHandler_Carbon;
if( !s->CompareNoCase("Carbon") ) ret = new InputHandler_Carbon;
#endif
if( ret == NULL )
@@ -66,12 +66,12 @@ void MakeInputHandlers(CString drivers, vector<InputHandler *> &Add)
}
// Always add
Add.push_back(new InputHandler_MonkeyKeyboard);
Add.push_back( new InputHandler_MonkeyKeyboard );
}
#include "Lights/Selector_LightsDriver.h"
void MakeLightsDrivers(CString driver, vector<LightsDriver *> &Add)
void MakeLightsDrivers( CString driver, vector<LightsDriver *> &Add )
{
LOG->Trace( "Initializing lights driver: %s", driver.c_str() );
@@ -81,10 +81,10 @@ void MakeLightsDrivers(CString driver, vector<LightsDriver *> &Add)
if( !driver.CompareNoCase("LinuxParallel") ) ret = new LightsDriver_LinuxParallel;
#endif
#ifdef USE_LIGHTS_DRIVER_LINUX_WEEDTECH
if( !driver.CompareNoCase("WeedTech") ) ret = new LightsDriver_LinuxWeedTech;
if( !driver.CompareNoCase("WeedTech") ) ret = new LightsDriver_LinuxWeedTech;
#endif
#ifdef USE_LIGHTS_DRIVER_WIN32_PARALLEL
if( !driver.CompareNoCase("Parallel") ) ret = new LightsDriver_Win32Parallel;
if( !driver.CompareNoCase("Parallel") ) ret = new LightsDriver_Win32Parallel;
#endif
if( ret == NULL && driver.CompareNoCase("Null") )
@@ -101,35 +101,34 @@ LoadingWindow *MakeLoadingWindow()
if( !PREFSMAN->m_bShowLoadingWindow )
return new LoadingWindow_Null;
/* Don't load NULL by default. On most systems, if we can't load the SDL
* loading window, we won't be able to init OpenGL, either, so don't bother. */
/* Don't load NULL by default. */
const CString drivers = "xbox,win32,cocoa,gtk";
vector<CString> DriversToTry;
split(drivers, ",", DriversToTry, true);
split( drivers, ",", DriversToTry, true );
ASSERT( DriversToTry.size() != 0 );
CString Driver;
LoadingWindow *ret = NULL;
for(unsigned i = 0; ret == NULL && i < DriversToTry.size(); ++i)
for( unsigned i = 0; ret == NULL && i < DriversToTry.size(); ++i )
{
Driver = DriversToTry[i];
#ifdef USE_LOADING_WINDOW_COCOA
if(!DriversToTry[i].CompareNoCase("Cocoa") ) ret = new LoadingWindow_Cocoa;
if( !DriversToTry[i].CompareNoCase("Cocoa") ) ret = new LoadingWindow_Cocoa;
#endif
#ifdef USE_LOADING_WINDOW_GTK
if(!DriversToTry[i].CompareNoCase("Gtk") ) ret = new LoadingWindow_Gtk;
if( !DriversToTry[i].CompareNoCase("Gtk") ) ret = new LoadingWindow_Gtk;
#endif
#ifdef USE_LOADING_WINDOW_NULL
if(!DriversToTry[i].CompareNoCase("Null") ) ret = new LoadingWindow_Null;
if( !DriversToTry[i].CompareNoCase("Null") ) ret = new LoadingWindow_Null;
#endif
#ifdef USE_LOADING_WINDOW_WIN32
if(!DriversToTry[i].CompareNoCase("Win32") ) ret = new LoadingWindow_Win32;
if( !DriversToTry[i].CompareNoCase("Win32") ) ret = new LoadingWindow_Win32;
#endif
#ifdef USE_LOADING_WINDOW_XBOX
if(!DriversToTry[i].CompareNoCase("Xbox") ) ret = new LoadingWindow_Xbox;
if( !DriversToTry[i].CompareNoCase("Xbox") ) ret = new LoadingWindow_Xbox;
#endif
@@ -139,13 +138,13 @@ LoadingWindow *MakeLoadingWindow()
CString sError = ret->Init();
if( sError != "" )
{
LOG->Info("Couldn't load driver %s: %s", DriversToTry[i].c_str(), sError.c_str());
LOG->Info( "Couldn't load driver %s: %s", DriversToTry[i].c_str(), sError.c_str() );
SAFE_DELETE( ret );
}
}
if(ret)
LOG->Info("Loading window: %s", Driver.c_str());
LOG->Info( "Loading window: %s", Driver.c_str() );
return ret;
}
@@ -181,7 +180,7 @@ static Preference<CString> g_sMovieDrivers( "MovieDrivers", "" ); // "" == defau
#include "MovieTexture/Selector_MovieTexture.h"
static void DumpAVIDebugInfo( const CString& fn );
/* Try drivers in order of preference until we find one that works. */
static LocalizedString MOVIE_DRIVERS_EMPTY ( "Arch", "Movie Drivers cannot be empty." );
static LocalizedString MOVIE_DRIVERS_EMPTY ( "Arch", "Movie Drivers cannot be empty." );
static LocalizedString COULDNT_CREATE_MOVIE_DRIVER ( "Arch", "Couldn't create a movie driver." );
RageMovieTexture *MakeRageMovieTexture( RageTextureID ID )
{
@@ -232,17 +231,17 @@ RageMovieTexture *MakeRageMovieTexture( RageTextureID ID )
if (!ret)
RageException::Throw( COULDNT_CREATE_MOVIE_DRIVER.GetValue() );
LOG->Trace("Created movie texture \"%s\" with driver \"%s\"",
ID.filename.c_str(), Driver.c_str() );
LOG->Trace( "Created movie texture \"%s\" with driver \"%s\"",
ID.filename.c_str(), Driver.c_str() );
return ret;
}
#include "Sound/Selector_RageSoundDriver.h"
static LocalizedString SOUND_DRIVERS_CANNOT_EMPTY( "Arch", "Sound Drivers cannot be empty." );
RageSoundDriver *MakeRageSoundDriver(CString drivers)
RageSoundDriver *MakeRageSoundDriver( CString drivers )
{
vector<CString> DriversToTry;
split(drivers, ",", DriversToTry, true);
split( drivers, ",", DriversToTry, true );
if( DriversToTry.empty() )
RageException::Throw( SOUND_DRIVERS_CANNOT_EMPTY.GetValue() );
@@ -250,34 +249,34 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers)
CString Driver;
RageSoundDriver *ret = NULL;
for(unsigned i = 0; ret == NULL && i < DriversToTry.size(); ++i)
for( unsigned i = 0; ret == NULL && i < DriversToTry.size(); ++i )
{
Driver = DriversToTry[i];
LOG->Trace( "Initializing driver: %s", DriversToTry[i].c_str() );
#ifdef USE_RAGE_SOUND_ALSA9
if(!DriversToTry[i].CompareNoCase("ALSA")) ret = new RageSound_ALSA9;
if( !DriversToTry[i].CompareNoCase("ALSA") ) ret = new RageSound_ALSA9;
#endif
#ifdef USE_RAGE_SOUND_ALSA9_SOFTWARE
if(!DriversToTry[i].CompareNoCase("ALSA-sw")) ret = new RageSound_ALSA9_Software;
if( !DriversToTry[i].CompareNoCase("ALSA-sw") ) ret = new RageSound_ALSA9_Software;
#endif
#ifdef USE_RAGE_SOUND_CA
if(!DriversToTry[i].CompareNoCase("CoreAudio")) ret = new RageSound_CA;
if( !DriversToTry[i].CompareNoCase("CoreAudio") ) ret = new RageSound_CA;
#endif
#ifdef USE_RAGE_SOUND_DSOUND
if(!DriversToTry[i].CompareNoCase("DirectSound")) ret = new RageSound_DSound;
if( !DriversToTry[i].CompareNoCase("DirectSound") ) ret = new RageSound_DSound;
#endif
#ifdef USE_RAGE_SOUND_DSOUND_SOFTWARE
if(!DriversToTry[i].CompareNoCase("DirectSound-sw")) ret = new RageSound_DSound_Software;
if( !DriversToTry[i].CompareNoCase("DirectSound-sw") ) ret = new RageSound_DSound_Software;
#endif
#ifdef USE_RAGE_SOUND_NULL
if(!DriversToTry[i].CompareNoCase("Null")) ret = new RageSound_Null;
if( !DriversToTry[i].CompareNoCase("Null") ) ret = new RageSound_Null;
#endif
#ifdef USE_RAGE_SOUND_OSS
if(!DriversToTry[i].CompareNoCase("OSS")) ret = new RageSound_OSS;
if( !DriversToTry[i].CompareNoCase("OSS") ) ret = new RageSound_OSS;
#endif
#ifdef USE_RAGE_SOUND_WAVE_OUT
if(!DriversToTry[i].CompareNoCase("WaveOut")) ret = new RageSound_WaveOut;
if( !DriversToTry[i].CompareNoCase("WaveOut") ) ret = new RageSound_WaveOut;
#endif
if( ret == NULL )
@@ -307,7 +306,7 @@ static void DumpAVIDebugInfo( const CString& fn )
if( !RageMovieTexture::GetFourCC( fn, handler, type ) )
return;
LOG->Trace("Movie %s has handler '%s', type '%s'", fn.c_str(), handler.c_str(), type.c_str());
LOG->Trace( "Movie %s has handler '%s', type '%s'", fn.c_str(), handler.c_str(), type.c_str() );
}
/*
stepmania/src/arch/arch.h
+4 -4
View File
@@ -21,10 +21,10 @@ class DialogDriver;
DialogDriver *MakeDialogDriver();
class InputHandler;
void MakeInputHandlers(CString drivers, vector<InputHandler *> &Add);
void MakeInputHandlers( CString drivers, vector<InputHandler *> &Add );
class LightsDriver;
void MakeLightsDrivers(CString drivers, vector<LightsDriver *> &Add);
void MakeLightsDrivers( CString drivers, vector<LightsDriver *> &Add );
class LoadingWindow;
LoadingWindow *MakeLoadingWindow();
@@ -38,10 +38,10 @@ class MemoryCardDriver;
MemoryCardDriver *MakeMemoryCardDriver();
class RageMovieTexture;
RageMovieTexture *MakeRageMovieTexture(RageTextureID ID);
RageMovieTexture *MakeRageMovieTexture( RageTextureID ID );
class RageSoundDriver;
RageSoundDriver *MakeRageSoundDriver(CString drivers);
RageSoundDriver *MakeRageSoundDriver( CString drivers );
#endif