aboutsummaryrefslogtreecommitdiff
path: root/engines/made/music.cpp
diff options
context:
space:
mode:
authorKirben2015-07-02 23:05:50 +1000
committerKirben2015-07-02 23:05:50 +1000
commit3ad35f760c25aed3036f691c75ebc79d7cbcacae (patch)
tree7633d42698e2ecc822c1a62d16926bfe05f09090 /engines/made/music.cpp
parentdba1ab40a312b50137bfee415df95dce3c4a1184 (diff)
downloadscummvm-rg350-3ad35f760c25aed3036f691c75ebc79d7cbcacae.tar.gz
scummvm-rg350-3ad35f760c25aed3036f691c75ebc79d7cbcacae.tar.bz2
scummvm-rg350-3ad35f760c25aed3036f691c75ebc79d7cbcacae.zip
MADE: Limit Miles audio to Return to Zork only, and enable Adlib support.
Diffstat (limited to 'engines/made/music.cpp')
-rw-r--r--engines/made/music.cpp39
1 files changed, 20 insertions, 19 deletions
diff --git a/engines/made/music.cpp b/engines/made/music.cpp
index b11f071a76..6e5acb88b0 100644
--- a/engines/made/music.cpp
+++ b/engines/made/music.cpp
@@ -32,25 +32,26 @@
namespace Made {
-MusicPlayer::MusicPlayer() : _isGM(false),_milesAudioMode(false) {
- MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MT32);
- MusicType musicType = MidiDriver::getMusicType(dev);
-
- switch (musicType) {
- case MT_ADLIB:
- // Adlib disabled due to known issues
- //_milesAudioMode = true;
- //_driver = Audio::MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.AD");
- MidiPlayer::createDriver();
- break;
- case MT_MT32:
- _milesAudioMode = true;
- _driver = Audio::MidiDriver_Miles_MT32_create("");
- break;
- default:
- _milesAudioMode = false;
- MidiPlayer::createDriver();
- break;
+MusicPlayer::MusicPlayer(bool milesAudio) : _isGM(false),_milesAudioMode(false) {
+ if (milesAudio) {
+ MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MT32);
+ MusicType musicType = MidiDriver::getMusicType(dev);
+ switch (musicType) {
+ case MT_ADLIB:
+ _milesAudioMode = true;
+ _driver = Audio::MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.AD");
+ break;
+ case MT_MT32:
+ _milesAudioMode = true;
+ _driver = Audio::MidiDriver_Miles_MT32_create("");
+ break;
+ default:
+ _milesAudioMode = false;
+ MidiPlayer::createDriver();
+ break;
+ }
+ } else {
+ MidiPlayer::createDriver();
}
int ret = _driver->open();