diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/sfx/music.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sfx/music.h | 2 | ||||
| -rw-r--r-- | engines/sci/sfx/soundcmd.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/engines/sci/sfx/music.cpp b/engines/sci/sfx/music.cpp index e0628abe28..105e23d05c 100644 --- a/engines/sci/sfx/music.cpp +++ b/engines/sci/sfx/music.cpp @@ -333,7 +333,7 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) { pSnd->pMidiParser->setTimerRate(_dwTempo); } // Find out what channels to filter for SCI0 - channelFilterMask = pSnd->soundRes->getChannelFilterMask(0x04); // Adlib hardcoded (TODO) + channelFilterMask = pSnd->soundRes->getChannelFilterMask(_pMidiDrv->getPlayMask()); pSnd->pMidiParser->loadMusic(track, pSnd, channelFilterMask); } } diff --git a/engines/sci/sfx/music.h b/engines/sci/sfx/music.h index 5e9d477453..ccaad506b5 100644 --- a/engines/sci/sfx/music.h +++ b/engines/sci/sfx/music.h @@ -149,7 +149,7 @@ protected: void doFade(MusicEntry *pSnd); Audio::Mixer *_pMixer; - MidiDriver *_pMidiDrv; + MidiPlayer *_pMidiDrv; MidiDriverType _midiType; Common::Mutex _mutex; diff --git a/engines/sci/sfx/soundcmd.cpp b/engines/sci/sfx/soundcmd.cpp index 6311216f4d..3c8c892127 100644 --- a/engines/sci/sfx/soundcmd.cpp +++ b/engines/sci/sfx/soundcmd.cpp @@ -770,7 +770,9 @@ void SoundCommandParser::cmdSendMidi(reg_t obj, int16 value) { void SoundCommandParser::cmdReverb(reg_t obj, int16 value) { // TODO + warning("STUB: cmdReverb"); } + void SoundCommandParser::cmdHoldHandle(reg_t obj, int16 value) { #ifdef USE_OLD_MUSIC_FUNCTIONS SongHandle handle = FROBNICATE_HANDLE(obj); |