[Scummvm-cvs-logs] SF.net SVN: scummvm:[47819] scummvm/trunk/engines/sci/sound/music.cpp

[mthreepwood at users.sourceforge.net]

Revision: 47819
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47819&view=rev
Author:   mthreepwood
Date:     2010-02-02 19:39:02 +0000 (Tue, 02 Feb 2010)

Log Message:
-----------
Use MIDI by default for SCI32. Fixes the GK2 demo.

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-02-02 17:33:52 UTC (rev 47818)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-02-02 19:39:02 UTC (rev 47819)
@@ -61,8 +61,15 @@
 	// SCI sound init
 	_dwTempo = 0;
 
-	MidiDriverType midiType = MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_ADLIB | MDT_MIDI);
+	MidiDriverType midiType;
 
+#ifdef ENABLE_SCI32
+	if (getSciVersion() >= SCI_VERSION_2)
+		midiType = MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MIDI);
+	else
+#endif
+		midiType = MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_ADLIB | MDT_MIDI);
+
 	switch (midiType) {
 	case MD_ADLIB:
 		// FIXME: There's no Amiga sound option, so we hook it up to AdLib


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.