From 2202eb85470dd03ff31f24136a05d5905311fa88 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 18 Nov 2006 17:31:18 +0000 Subject: [PATCH] Workaround for Windows API issues (PlaySound -> PlaySound[A/U] bug). Thank rikai for testing on Linux. Untested on Mac right now. --- stepmania/src/RageSound.cpp | 2 +- stepmania/src/RageSoundManager.cpp | 4 ++-- stepmania/src/RageSoundManager.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp index c1550b2a05..ba04a2c5b5 100644 --- a/stepmania/src/RageSound.cpp +++ b/stepmania/src/RageSound.cpp @@ -647,7 +647,7 @@ RageSound *RageSound::Play( const RageSoundParams *pParams ) return NULL; } - return SOUNDMAN->PlaySound( *this, pParams ); + return SOUNDMAN->PlayTheSound( *this, pParams ); } void RageSound::Stop() diff --git a/stepmania/src/RageSoundManager.cpp b/stepmania/src/RageSoundManager.cpp index 02562bc757..8335b2260f 100644 --- a/stepmania/src/RageSoundManager.cpp +++ b/stepmania/src/RageSoundManager.cpp @@ -244,9 +244,9 @@ int RageSoundManager::GetDriverSampleRate( int iRate ) const return m_pDriver->GetSampleRate( iRate ); } -/* The return value of PlaySound and PlayCopyOfSound is only valid in the main +/* The return value of PlayTheSound and PlayCopyOfSound is only valid in the main * thread, until the next call to Update(). After that, it may be deleted. */ -RageSound *RageSoundManager::PlaySound( RageSound &snd, const RageSoundParams *params ) +RageSound *RageSoundManager::PlayTheSound( RageSound &snd, const RageSoundParams *params ) { if( snd.IsPlaying() ) return PlayCopyOfSound( snd, params ); diff --git a/stepmania/src/RageSoundManager.h b/stepmania/src/RageSoundManager.h index 4e42436de9..6408cc13b9 100644 --- a/stepmania/src/RageSoundManager.h +++ b/stepmania/src/RageSoundManager.h @@ -55,7 +55,7 @@ public: void PlayOnce( RString sPath ); - RageSound *PlaySound( RageSound &snd, const RageSoundParams *params = NULL ); + RageSound *PlayTheSound( RageSound &snd, const RageSoundParams *params = NULL ); RageSound *PlayCopyOfSound( RageSound &snd, const RageSoundParams *params = NULL ); private: