diff options
| author | Torbjörn Andersson | 2003-09-02 12:55:20 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-09-02 12:55:20 +0000 |
| commit | 8c61a29c29abfb3501dcde5ba6bcca2416ba00a4 (patch) | |
| tree | 4429cd73af0383841f334f543fce809cf3497d4e /sword2/driver | |
| parent | f90b5f06a5b6cb089415229c89a4a1f5b02f8c45 (diff) | |
| download | scummvm-rg350-8c61a29c29abfb3501dcde5ba6bcca2416ba00a4.tar.gz scummvm-rg350-8c61a29c29abfb3501dcde5ba6bcca2416ba00a4.tar.bz2 scummvm-rg350-8c61a29c29abfb3501dcde5ba6bcca2416ba00a4.zip | |
Since soundHandleMusic[] is now an array of sound handles instead of
channel indexes, we should use stopHandle() instead of stop() to kill the
music channel.
Am I the only one who finds the distinction between channel indexes and
sound handles confusing at times? :-)
svn-id: r9967
Diffstat (limited to 'sword2/driver')
| -rw-r--r-- | sword2/driver/d_sound.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index 4b19e1c2df..83241b23c1 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -1205,7 +1205,7 @@ uint8 Sword2Sound::IsFxMute(void) { } void Sword2Sound::StartMusicFadeDown(int i) { - g_engine->_mixer->stop(soundHandleMusic[i]); + g_engine->_mixer->stopHandle(soundHandleMusic[i]); musFading[i] = -16; musStreaming[i] = 0; fpMus.close(); @@ -1231,7 +1231,7 @@ int32 Sword2Sound::StreamCompMusic(const char *filename, uint32 musicId, int32 l primaryStream = 1; musFading[primaryStream] = 0; - g_engine->_mixer->stop(soundHandleMusic[primaryStream]); + g_engine->_mixer->stopHandle(soundHandleMusic[primaryStream]); musStreaming[primaryStream] = 0; } @@ -1798,7 +1798,7 @@ void Sword2Sound::UpdateCompSampleStreaming(void) { if (musFading[i]) { if (musFading[i] < 0) { if (++musFading[i] == 0) { - g_engine->_mixer->stop(soundHandleMusic[i]); + g_engine->_mixer->stopHandle(soundHandleMusic[i]); musStreaming[i] = 0; musLooping[i] = 0; } else { @@ -1916,7 +1916,7 @@ void Sword2Sound::UpdateCompSampleStreaming(void) { // End of the music so we need to start fading and start the music again if (fade) { - g_engine->_mixer->stop(soundHandleMusic[i]); + g_engine->_mixer->stopHandle(soundHandleMusic[i]); musFading[i] = -16; // Fade the old music // Close the music cluster if it's open |