diff options
Diffstat (limited to 'engines/toltecs/music.cpp')
| -rw-r--r-- | engines/toltecs/music.cpp | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/engines/toltecs/music.cpp b/engines/toltecs/music.cpp index e4e067de39..97d8b1aea2 100644 --- a/engines/toltecs/music.cpp +++ b/engines/toltecs/music.cpp @@ -21,6 +21,7 @@ */ #include "audio/midiparser.h" +#include "audio/miles.h" #include "common/textconsole.h" #include "toltecs/toltecs.h" @@ -30,20 +31,47 @@ namespace Toltecs { MusicPlayer::MusicPlayer(bool isGM) : _isGM(isGM), _buffer(NULL) { - MidiPlayer::createDriver(); + MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM); + MusicType musicType = MidiDriver::getMusicType(dev); + + switch (musicType) { + case MT_ADLIB: + _milesAudioMode = true; + _driver = Audio::MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.OPL"); + break; + case MT_MT32: + // Not recommended since it sounds awful, but apparently the + // original sounded just as bad. I guess MT-32 support was + // added by default, not because anyone actually put any work + // into it. + _milesAudioMode = true; + _driver = Audio::MidiDriver_Miles_MT32_create(""); + break; + default: + _milesAudioMode = false; + MidiPlayer::createDriver(); + break; + } int ret = _driver->open(); if (ret == 0) { - if (_nativeMT32) - _driver->sendMT32Reset(); - else - _driver->sendGMReset(); + if (musicType != MT_ADLIB) { + if (musicType == MT_MT32 || _nativeMT32) + _driver->sendMT32Reset(); + else + _driver->sendGMReset(); + } _driver->setTimerCallback(this, &timerCallback); } } void MusicPlayer::send(uint32 b) { + if (_milesAudioMode) { + _driver->send(b); + return; + } + if ((b & 0xF0) == 0xC0 && !_isGM && !_nativeMT32) { b = (b & 0xFFFF00FF) | MidiDriver::_mt32ToGm[(b >> 8) & 0xFF] << 8; } |