[Scummvm-cvs-logs] SF.net SVN: scummvm:[47156] scummvm/trunk/engines/sci/sound/music.cpp
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Fri Jan 8 15:26:26 CET 2010
Revision: 47156
http://scummvm.svn.sourceforge.net/scummvm/?rev=47156&view=rev
Author: m_kiewitz
Date: 2010-01-08 14:26:26 +0000 (Fri, 08 Jan 2010)
Log Message:
-----------
SCI: changed handling when unsupported sound type is selected, we are switching to adlib or amiga sound then
Modified Paths:
--------------
scummvm/trunk/engines/sci/sound/music.cpp
Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp 2010-01-08 14:02:08 UTC (rev 47155)
+++ scummvm/trunk/engines/sci/sound/music.cpp 2010-01-08 14:26:26 UTC (rev 47156)
@@ -72,6 +72,16 @@
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 @@
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) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list