diff options
| author | Vincent Bénony | 2016-01-06 16:20:23 +0100 |
|---|---|---|
| committer | Vincent Bénony | 2016-01-06 16:20:23 +0100 |
| commit | efdb5679ce6304dbc854afbbc511e633d7513338 (patch) | |
| tree | e680a240e5f6018fc3a4cce53b50060caa22a929 /audio/softsynth/mt32.cpp | |
| parent | 4687ff6d6d2863cc95c8137543ecf9c39bc01723 (diff) | |
| parent | b72c02bad44749a1355acefdb198e36b2e772575 (diff) | |
| download | scummvm-rg350-efdb5679ce6304dbc854afbbc511e633d7513338.tar.gz scummvm-rg350-efdb5679ce6304dbc854afbbc511e633d7513338.tar.bz2 scummvm-rg350-efdb5679ce6304dbc854afbbc511e633d7513338.zip | |
IOS: Merge branch 'master' into ios-fix
Diffstat (limited to 'audio/softsynth/mt32.cpp')
| -rw-r--r-- | audio/softsynth/mt32.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp index b9799db618..4420657854 100644 --- a/audio/softsynth/mt32.cpp +++ b/audio/softsynth/mt32.cpp @@ -199,10 +199,10 @@ int MidiDriver_MT32::open() { _initializing = true; debug(4, _s("Initializing MT-32 Emulator")); _controlFile = new Common::File(); - if (!_controlFile->open("MT32_CONTROL.ROM") && !_controlFile->open("CM32L_CONTROL.ROM")) + if (!_controlFile->open("CM32L_CONTROL.ROM") && !_controlFile->open("MT32_CONTROL.ROM")) error("Error opening MT32_CONTROL.ROM / CM32L_CONTROL.ROM"); _pcmFile = new Common::File(); - if (!_pcmFile->open("MT32_PCM.ROM") && !_pcmFile->open("CM32L_PCM.ROM")) + if (!_pcmFile->open("CM32L_PCM.ROM") && !_pcmFile->open("MT32_PCM.ROM")) error("Error opening MT32_PCM.ROM / CM32L_PCM.ROM"); _controlROM = MT32Emu::ROMImage::makeROMImage(_controlFile); _pcmROM = MT32Emu::ROMImage::makeROMImage(_pcmFile); |