[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.61,1.62

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv12088/queen

Modified Files:
	queen.cpp 
Log Message:
Tell adlib people they won't hear music


Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- queen.cpp	29 Dec 2003 20:18:31 -0000	1.61
+++ queen.cpp	2 Jan 2004 14:21:14 -0000	1.62
@@ -44,6 +44,8 @@
 #include "queen/talk.h"
 #include "queen/walk.h"
 
+#include "sound/mididrv.h"
+
 extern uint16 _debugLevel;
 
 #ifdef _WIN32_WCE
@@ -165,7 +167,14 @@
 	_graphics = new Graphics(this);
 	_input = new Input(_resource->getLanguage(), _system);
 	_logic = new Logic(this);
-	_music = new Music(GameDetector::createMidi(GameDetector::detectMusicDriver(MDT_NATIVE)), this);
+
+	int midiDriver = GameDetector::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE);
+	if (midiDriver == MD_ADLIB) {
+		warning("Adlib music not supported, please use native MIDI if possible");
+		midiDriver = MD_NULL;
+	}
+
+	_music = new Music(GameDetector::createMidi(midiDriver), this);
 	_sound = Sound::giveSound(_mixer, this, _resource->compression());
 	_walk = new Walk(this);
 	_timer->installTimerProc(&timerHandler, 1000000 / 50, this); //call 50 times per second