diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp index aa52671ac0..3d6c0e84e8 100644 --- a/stepmania/src/arch/arch.cpp +++ b/stepmania/src/arch/arch.cpp @@ -73,9 +73,12 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers) #ifdef HAVE_OSS if(!DriversToTry[i].CompareNoCase("OSS")) ret = new RageSound_OSS; #endif -#ifdef RAGE_SOUND_SDL - if(!DriversToTry[i].CompareNoCase("SDL")) ret = new RageSound_SDL; +#ifdef RAGE_SOUND_QT + if(!DriversToTry[i].CompareNoCase("QT")) ret = new RageSound_QT; #endif +/*#ifdef RAGE_SOUND_SDL + if(!DriversToTry[i].CompareNoCase("SDL")) ret = new RageSound_SDL; +#endif*/ if(!DriversToTry[i].CompareNoCase("Null")) ret = new RageSound_Null; if( !ret ) LOG->Warn("Unknown sound driver name: %s", DriversToTry[i].c_str()); diff --git a/stepmania/src/arch/arch.h b/stepmania/src/arch/arch.h index 78359fabf5..e49f592380 100644 --- a/stepmania/src/arch/arch.h +++ b/stepmania/src/arch/arch.h @@ -22,7 +22,8 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers); #if defined(LINUX) #define DEFAULT_SOUND_DRIVER_LIST "ALSA9,OSS,Null" #elif defined(DARWIN) -#define DEFAULT_SOUND_DRIVER_LIST "SDL,Null" +//#define DEFAULT_SOUND_DRIVER_LIST "QT,SDL,Null" +#define DEFAULT_SOUND_DRIVER_LIST "QT,Null" #elif defined(WIN32) #define DEFAULT_SOUND_DRIVER_LIST "DirectSound,DirectSound-sw,WaveOut" #else diff --git a/stepmania/src/arch/arch_darwin.h b/stepmania/src/arch/arch_darwin.h index b0cc448e33..5949161ad3 100644 --- a/stepmania/src/arch/arch_darwin.h +++ b/stepmania/src/arch/arch_darwin.h @@ -11,7 +11,8 @@ */ #include -#include "Sound/RageSoundDriver_SDL.h" +//#include "Sound/RageSoundDriver_SDL.h" +#include "Sound/RageSoundDriver_QT.h" #endif