libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-07 11:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Since soundHandleMusic[] is now an array of sound handles instead of

Browse Source 
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
This commit is contained in:
Torbjörn Andersson 2003-09-02 12:55:20 +00:00
parent f90b5f06a5
commit 8c61a29c29
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sword2/driver/d_sound.cpp
View File

@ -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