diff options
| author | Florian Kagerer | 2010-06-25 20:51:57 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2010-06-25 20:51:57 +0000 |
| commit | c35e3505319977e56d1c413b39133dfedf6c1105 (patch) | |
| tree | 9bdc8bd3f602b347d56dd221132b14d1ce8ecc34 /engines/groovie | |
| parent | 683d54a74660745d6bd408788170b19adb08581e (diff) | |
| download | scummvm-rg350-c35e3505319977e56d1c413b39133dfedf6c1105.tar.gz scummvm-rg350-c35e3505319977e56d1c413b39133dfedf6c1105.tar.bz2 scummvm-rg350-c35e3505319977e56d1c413b39133dfedf6c1105.zip | |
AUDIO: get rid of MDT_PREFER_MIDI since it should be sufficient to either select MDT_PREFER_MT32 or MDT_PREFER_GM
svn-id: r50288
Diffstat (limited to 'engines/groovie')
| -rw-r--r-- | engines/groovie/music.cpp | 4 | ||||
| -rw-r--r-- | engines/groovie/script.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp index 9b46af1483..f226ef3397 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -386,7 +386,7 @@ MusicPlayerXMI::MusicPlayerXMI(GroovieEngine *vm, const Common::String >lName) _midiParser = MidiParser::createParser_XMIDI(); // Create the driver - MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI); + MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM); _driver = createMidi(dev); this->open(); @@ -682,7 +682,7 @@ MusicPlayerMac::MusicPlayerMac(GroovieEngine *vm) : MusicPlayerMidi(vm) { _midiParser = MidiParser::createParser_SMF(); // Create the driver - MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI); + MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM); _driver = createMidi(dev); this->open(); diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp index 08df5e7a83..9fd7fa7d63 100644 --- a/engines/groovie/script.cpp +++ b/engines/groovie/script.cpp @@ -86,7 +86,7 @@ Script::Script(GroovieEngine *vm, EngineVersion version) : } // Initialize the music type variable - MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI); + MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM); if (MidiDriver::getMusicType(dev) == MT_ADLIB) { // MIDI through AdLib setVariable(0x100, 0); |