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

Remove nonexistant audio driver, do not use SDL for input and simplify since HAVE_XDK is checked first.

Browse Source
This commit is contained in:
Steve Checkoway
2006-01-21 14:37:03 +00:00
parent 2dc6a8fa66
commit 1414546919
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/arch.cpp
-3
View File
@@ -276,9 +276,6 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers)
#ifdef USE_RAGE_SOUND_OSS #ifdef USE_RAGE_SOUND_OSS
if(!DriversToTry[i].CompareNoCase("OSS")) ret = new RageSound_OSS; if(!DriversToTry[i].CompareNoCase("OSS")) ret = new RageSound_OSS;
#endif #endif
#ifdef USE_RAGE_SOUND_QT1
if(!DriversToTry[i].CompareNoCase("QT1")) ret = new RageSound_QT1;
#endif
#ifdef USE_RAGE_SOUND_WAVE_OUT #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 #endif
stepmania/src/arch/arch_default.h
+3 -3
View File
@@ -11,12 +11,12 @@
/* InputHandler drivers */ /* InputHandler drivers */
#if defined (HAVE_XDK) #if defined (HAVE_XDK)
#define DEFAULT_INPUT_DRIVER_LIST "Xbox" #define DEFAULT_INPUT_DRIVER_LIST "Xbox"
#elif defined(HAVE_DIRECTX) && !defined(HAVE_XDK) #elif defined(HAVE_DIRECTX)
#define DEFAULT_INPUT_DRIVER_LIST "DirectInput,Pump,Para" #define DEFAULT_INPUT_DRIVER_LIST "DirectInput,Pump,Para"
#elif defined(HAVE_X11) // Prefer X11 over SDL #elif defined(HAVE_X11) // Prefer X11 over SDL
#define DEFAULT_INPUT_DRIVER_LIST "X11,Joystick" #define DEFAULT_INPUT_DRIVER_LIST "X11,Joystick"
#elif defined(MACOSX) #elif defined(MACOSX)
# define DEFAULT_INPUT_DRIVER_LIST "Carbon,SDL" # define DEFAULT_INPUT_DRIVER_LIST "Carbon"
#elif defined(HAVE_SDL) #elif defined(HAVE_SDL)
#define DEFAULT_INPUT_DRIVER_LIST "SDL" #define DEFAULT_INPUT_DRIVER_LIST "SDL"
#elif defined(LINUX) #elif defined(LINUX)
@@ -29,7 +29,7 @@
#define DEFAULT_MOVIE_DRIVER_LIST "Theora,FFMpeg,DShow,Null" #define DEFAULT_MOVIE_DRIVER_LIST "Theora,FFMpeg,DShow,Null"
/* RageSoundDrivers */ /* RageSoundDrivers */
#define DEFAULT_SOUND_DRIVER_LIST "ALSA,DirectSound,ALSA-sw,DirectSound-sw,CoreAudio,OSS,QT1,WaveOut,Null" #define DEFAULT_SOUND_DRIVER_LIST "ALSA,DirectSound,ALSA-sw,DirectSound-sw,CoreAudio,OSS,WaveOut,Null"
#endif #endif