libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 09:56:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

SCI: move setVolume down inside loadMusic so that it actually affects the used channels

Browse Source 
svn-id: r50058
This commit is contained in:
Martin Kiewitz 2010-06-19 19:39:36 +00:00
parent 447f127013
commit a845e8b859
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/sci/sound/midiparser_sci.cpp
View File

@ -81,9 +81,6 @@ 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
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);
@ -91,6 +88,9 @@ bool MidiParser_SCI::loadMusic(SoundResource::Track *track, MusicEntry *psnd, in
midiMixChannels();
}
if (_pSnd)
setVolume(_pSnd->volume);
_num_tracks = 1;
_tracks[0] = _mixedData;
if (_pSnd)