diff options
| author | athrxx | 2019-06-23 03:58:02 +0200 |
|---|---|---|
| committer | athrxx | 2019-07-14 20:56:27 +0200 |
| commit | 0899ecc98760bba79bccc2026bcfa44542d46d8f (patch) | |
| tree | 77ac976f51d4cb51a1e0c61ab269e0002b86f1eb /engines/scumm/scumm.cpp | |
| parent | 9afdde2601b64f724c2e5c4d4b43ba04709a27f1 (diff) | |
| download | scummvm-rg350-0899ecc98760bba79bccc2026bcfa44542d46d8f.tar.gz scummvm-rg350-0899ecc98760bba79bccc2026bcfa44542d46d8f.tar.bz2 scummvm-rg350-0899ecc98760bba79bccc2026bcfa44542d46d8f.zip | |
SCUMM: hook up Amiga MI2 + INDY4 to new sound driver
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 1102890650..f6e0f9ede6 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -78,6 +78,7 @@ #include "scumm/verbs.h" #include "scumm/imuse/pcspk.h" #include "scumm/imuse/mac_m68k.h" +#include "scumm/imuse/drivers/amiga.h" #include "backends/audiocd/audiocd.h" @@ -1837,6 +1838,9 @@ void ScummEngine::setupMusic(int midi) { case MT_NULL: _sound->_musicType = MDT_NONE; break; + case MT_AMIGA: + _sound->_musicType = MDT_AMIGA; + break; case MT_PCSPK: _sound->_musicType = MDT_PCSPK; break; @@ -1985,6 +1989,10 @@ void ScummEngine::setupMusic(int midi) { _native_mt32 = false; // Ignore non-native drivers. This also ignores the multi MIDI setting. useOnlyNative = true; + } else if (_sound->_musicType == MDT_AMIGA) { + nativeMidiDriver = new IMuseDriver_Amiga(_mixer); + _native_mt32 = false; + useOnlyNative = true; } else if (_sound->_musicType != MDT_ADLIB && _sound->_musicType != MDT_TOWNS && _sound->_musicType != MDT_PCSPK) { nativeMidiDriver = MidiDriver::createMidi(dev); } |