diff options
| author | Martin Kiewitz | 2010-06-19 19:47:22 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-06-19 19:47:22 +0000 |
| commit | 24459b5842e6cf8ef906e81c9b43c36c657f1119 (patch) | |
| tree | 791a44f86404f1daa71771c4353b6ed5b5d82ae7 | |
| parent | a845e8b859e215a24e68bfbc5990153faf733548 (diff) | |
| download | scummvm-rg350-24459b5842e6cf8ef906e81c9b43c36c657f1119.tar.gz scummvm-rg350-24459b5842e6cf8ef906e81c9b43c36c657f1119.tar.bz2 scummvm-rg350-24459b5842e6cf8ef906e81c9b43c36c657f1119.zip | |
SCI: reverting r50058 - we can't actually send to the channels at that time, because we do not own the channels at that point
svn-id: r50059
| -rw-r--r-- | engines/sci/sound/midiparser_sci.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp index 18eaba3de6..99468fe09c 100644 --- a/engines/sci/sound/midiparser_sci.cpp +++ b/engines/sci/sound/midiparser_sci.cpp @@ -81,6 +81,10 @@ bool MidiParser_SCI::loadMusic(SoundResource::Track *track, MusicEntry *psnd, in _channelRemap[9] = 9; // never map channel 9, because that's used for percussion _channelRemap[15] = 15; // never map channel 15, because thats used by sierra internally + // we can't do this later, because otherwise we really send to unmapped channels + if (_pSnd) + setVolume(_pSnd->volume); + if (channelFilterMask) { // SCI0 only has 1 data stream, but we need to filter out channels depending on music hardware selection midiFilterChannels(channelFilterMask); @@ -88,9 +92,6 @@ bool MidiParser_SCI::loadMusic(SoundResource::Track *track, MusicEntry *psnd, in midiMixChannels(); } - if (_pSnd) - setVolume(_pSnd->volume); - _num_tracks = 1; _tracks[0] = _mixedData; if (_pSnd) |