diff options
| author | Filippos Karapetis | 2010-02-03 23:02:37 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-02-03 23:02:37 +0000 |
| commit | ee66af41a2ab521350766540c5169bc16425306d (patch) | |
| tree | 9319dd6309f20cc22a7c7025939f2ac6c5a31514 | |
| parent | 7e166d1ad6498dd7ef3847014df3a69c410f8f53 (diff) | |
| download | scummvm-rg350-ee66af41a2ab521350766540c5169bc16425306d.tar.gz scummvm-rg350-ee66af41a2ab521350766540c5169bc16425306d.tar.bz2 scummvm-rg350-ee66af41a2ab521350766540c5169bc16425306d.zip | |
Fixed the hang with the new music code after the copy protection in Island of Dr. Brain
svn-id: r47870
| -rw-r--r-- | engines/sci/sound/music.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index e1446063af..c28676019b 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -499,12 +499,16 @@ void MusicEntry::doFade() { } // Only process MIDI streams in this thread, not digital sound effects - if (pMidiParser) -#ifndef DISABLE_VOLUME_FADING - pMidiParser->setVolume(volume); -#else - pMidiParser->setVolume(fadeTo); + if (pMidiParser) { +#ifdef DISABLE_VOLUME_FADING + // Signal fading to stop... + volume = fadeTo; + fadeStep = 0; + fadeCompleted = true; #endif + pMidiParser->setVolume(volume); + } + fadeSetVolume = true; // set flag so that SoundCommandParser::cmdUpdateCues will set the volume of the stream } } |