aboutsummaryrefslogtreecommitdiff
path: root/engines/draci/music.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2010-09-15 22:00:20 +0000
committerJohannes Schickel2010-09-15 22:00:20 +0000
commit6588398ce6fab85e287b10c2781d3797d7639cb9 (patch)
tree68bb65c1d3363aff0d66313661822a9040090236 /engines/draci/music.cpp
parentbb5db4aa3b67c7270b208fe43d829906f7409b63 (diff)
downloadscummvm-rg350-6588398ce6fab85e287b10c2781d3797d7639cb9.tar.gz
scummvm-rg350-6588398ce6fab85e287b10c2781d3797d7639cb9.tar.bz2
scummvm-rg350-6588398ce6fab85e287b10c2781d3797d7639cb9.zip
MIDI: Send a reset MIDI device signal on startup.
This is currently done in the engine code. I adapted AGI, AGOS, DRACI, GROOVIE, LURE, MADE, QUEEN, SAGA, SKY, TINSEL and TOUCHE to send a reset device on startup. The sound output still works fine (started up a game from every engine), so this should hopefully not introduce any regressions. As far as I can tell it seems that SCUMM does send a proper device reset, so I did not touch it. KYRA only sends a proper reset for MT-32 currently. I am not sure about SCI though. This fixes bug #3066826 "SIMON: MIDI notes off when using RTL after SCI". svn-id: r52736
Diffstat (limited to 'engines/draci/music.cpp')
-rw-r--r--engines/draci/music.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/draci/music.cpp b/engines/draci/music.cpp
index 8186d36068..509bf90121 100644
--- a/engines/draci/music.cpp
+++ b/engines/draci/music.cpp
@@ -40,13 +40,8 @@ MusicPlayer::MusicPlayer(MidiDriver *driver, const char *pathMask) : _parser(0),
memset(_channel, 0, sizeof(_channel));
memset(_channelVolume, 255, sizeof(_channelVolume));
_masterVolume = 0;
- this->open();
_smfParser = MidiParser::createParser_SMF();
_midiMusicData = NULL;
-
- // TODO: Load cmf.ins with the instrument table. It seems that an
- // interface for such an operation is supported for AdLib. Maybe for
- // this card, setting instruments is necessary.
}
MusicPlayer::~MusicPlayer() {
@@ -89,6 +84,15 @@ int MusicPlayer::open() {
if (ret)
return ret;
+ if (_nativeMT32)
+ _driver->sendMT32Reset();
+ else
+ _driver->sendGMReset();
+
+ // TODO: Load cmf.ins with the instrument table. It seems that an
+ // interface for such an operation is supported for AdLib. Maybe for
+ // this card, setting instruments is necessary.
+
_driver->setTimerCallback(this, &onTimer);
return 0;
}