From 0c2a2ad425e4b24f08f95d8d75ea4b642acf17af Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Tue, 29 Apr 2008 06:12:20 +0000 Subject: [PATCH] Don't include arch/arch_default.h from anywhere but in arch. RageSoundManager shouldn't depend on the input handler, for example. --- stepmania/src/RageSoundManager.cpp | 8 +------- stepmania/src/arch/Sound/RageSoundDriver.cpp | 5 +++-- stepmania/src/arch/Sound/RageSoundDriver.h | 1 + 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/stepmania/src/RageSoundManager.cpp b/stepmania/src/RageSoundManager.cpp index a07fc2044b..5957f01e1d 100644 --- a/stepmania/src/RageSoundManager.cpp +++ b/stepmania/src/RageSoundManager.cpp @@ -21,8 +21,6 @@ #include "arch/Sound/RageSoundDriver.h" -#include "arch/arch_default.h" - /* * The lock ordering requirements are: * RageSound::Lock before g_SoundManMutex @@ -46,11 +44,7 @@ RageSoundManager::RageSoundManager() static LocalizedString COULDNT_FIND_SOUND_DRIVER( "RageSoundManager", "Couldn't find a sound driver that works" ); void RageSoundManager::Init() { - RString sDrivers = g_sSoundDrivers; - if( sDrivers.empty() ) - sDrivers = DEFAULT_SOUND_DRIVER_LIST; - - m_pDriver = RageSoundDriver::Create( sDrivers ); + m_pDriver = RageSoundDriver::Create( g_sSoundDrivers ); if( m_pDriver == NULL ) RageException::Throw( "%s", COULDNT_FIND_SOUND_DRIVER.GetValue().c_str() ); } diff --git a/stepmania/src/arch/Sound/RageSoundDriver.cpp b/stepmania/src/arch/Sound/RageSoundDriver.cpp index 3d9c6dcdac..a491a5096f 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver.cpp @@ -3,13 +3,14 @@ #include "RageLog.h" #include "RageUtil.h" #include "Foreach.h" +#include "arch/arch_default.h" DriverList RageSoundDriver::m_pDriverList; -RageSoundDriver *RageSoundDriver::Create( const RString &drivers ) +RageSoundDriver *RageSoundDriver::Create( const RString& sDrivers ) { vector DriversToTry; - split( drivers, ",", DriversToTry, true ); + split( sDrivers.empty()? DEFAULT_SOUND_DRIVER_LIST:sDrivers, ",", DriversToTry, true ); FOREACH_CONST( RString, DriversToTry, Driver ) { diff --git a/stepmania/src/arch/Sound/RageSoundDriver.h b/stepmania/src/arch/Sound/RageSoundDriver.h index b560287316..3f1467b0ac 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver.h +++ b/stepmania/src/arch/Sound/RageSoundDriver.h @@ -15,6 +15,7 @@ static const int samples_per_block = 512; class RageSoundDriver: public RageDriver { public: + /* Pass an empty string to get the default sound driver list. */ static RageSoundDriver *Create( const RString &sDrivers ); static DriverList m_pDriverList;