From 960bc1eaac99ae9d1909932474163d07ae351aeb Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 7 Apr 2004 03:42:14 +0000 Subject: [PATCH] rename RageSoundManager::StopPlayingSound to RageSoundManager::StopPlayingAllCopiesOfSound --- stepmania/src/RageSound.cpp | 6 +++--- stepmania/src/RageSoundManager.cpp | 2 +- stepmania/src/RageSoundManager.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp index e63fdb4482..cef7179cd7 100644 --- a/stepmania/src/RageSound.cpp +++ b/stepmania/src/RageSound.cpp @@ -82,7 +82,7 @@ RageSound::~RageSound() /* If we're a "master" sound (not a copy), tell RageSoundManager to * stop mixing us and everything that's copied from us. */ if(original == this) - SOUNDMAN->StopPlayingSound(*this); + SOUNDMAN->StopPlayingAllCopiesOfSound(*this); Unload(); @@ -590,7 +590,7 @@ void RageSound::StopPlaying() stopped_position = (int) GetPositionSecondsInternal(); - /* Tell the sound manager to stop mixing this sound. */ + /* Tell the sound driver to stop mixing this sound. */ SOUNDMAN->StopMixing(this); SOUNDMAN->lock.Lock(); @@ -609,7 +609,7 @@ RageSound *RageSound::Play( const RageSoundParams *params ) void RageSound::Stop() { - SOUNDMAN->StopPlayingSound(*this); + SOUNDMAN->StopPlayingAllCopiesOfSound(*this); } diff --git a/stepmania/src/RageSoundManager.cpp b/stepmania/src/RageSoundManager.cpp index c077d59c5b..e006de56e6 100644 --- a/stepmania/src/RageSoundManager.cpp +++ b/stepmania/src/RageSoundManager.cpp @@ -181,7 +181,7 @@ RageSound *RageSoundManager::PlaySound( RageSound &snd, const RageSoundParams *p return sound_to_play; } -void RageSoundManager::StopPlayingSound(RageSound &snd) +void RageSoundManager::StopPlayingAllCopiesOfSound(RageSound &snd) { LockMut(lock); diff --git a/stepmania/src/RageSoundManager.h b/stepmania/src/RageSoundManager.h index ed9993ed1d..194d5102b2 100644 --- a/stepmania/src/RageSoundManager.h +++ b/stepmania/src/RageSoundManager.h @@ -54,7 +54,7 @@ public: void PlayOnce( CString sPath ); RageSound *PlaySound( RageSound &snd, const RageSoundParams *params ); - void StopPlayingSound(RageSound &snd); + void StopPlayingAllCopiesOfSound(RageSound &snd); /* A list of all sounds that currently exist. RageSound adds and removes * itself to this. */