diff options
| author | Martin Kiewitz | 2010-01-08 14:26:26 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-01-08 14:26:26 +0000 |
| commit | 723ad1bdc13b959b423c0867e4f3441f8e0bc855 (patch) | |
| tree | ca99d37c65ffed4189b081ff44fe6e058d0fc606 /engines | |
| parent | 54fc5121568eda38ec21897cb295a32471ce6d3a (diff) | |
| download | scummvm-rg350-723ad1bdc13b959b423c0867e4f3441f8e0bc855.tar.gz scummvm-rg350-723ad1bdc13b959b423c0867e4f3441f8e0bc855.tar.bz2 scummvm-rg350-723ad1bdc13b959b423c0867e4f3441f8e0bc855.zip | |
SCI: changed handling when unsupported sound type is selected, we are switching to adlib or amiga sound then
svn-id: r47156
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/sound/music.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index b8ecc0ac38..eb960a0dbc 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -72,6 +72,16 @@ void SciMusic::init() { switch (_midiType) { case MD_ADLIB: + case MD_PCJR: + case MD_PCSPK: + break; + default: + warning("Unhandled MIDI type, switching to default"); + _midiType = MD_ADLIB; + } + + switch (_midiType) { + case MD_ADLIB: // FIXME: There's no Amiga sound option, so we hook it up to Adlib if (((SciEngine *)g_engine)->getPlatform() == Common::kPlatformAmiga) _pMidiDrv = MidiPlayer_Amiga_create(); @@ -84,13 +94,8 @@ void SciMusic::init() { case MD_PCSPK: _pMidiDrv = new MidiPlayer_PCSpeaker(); break; - case MD_MT32: - // TODO - default: - warning("Unhandled MIDI type, switching to Adlib"); - _midiType = MD_ADLIB; - _pMidiDrv = MidiPlayer_Adlib_create(); - break; + //case MD_MT32: + // TODO } if (_pMidiDrv) { |