[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,1.103,1.104

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv15947

Modified Files:
	scummvm.cpp 
Log Message:
Fixed problem with multiple IMuseDrivers being created.

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- scummvm.cpp	21 Dec 2002 12:31:08 -0000	1.103
+++ scummvm.cpp	21 Dec 2002 20:12:14 -0000	1.104
@@ -151,21 +151,13 @@
 		_imuseDigital = new IMuseDigital(this);
 		_imuse = NULL;
 	} else {
-		if (detector->_use_adlib && false) {
-			_imuse = IMuse::create_adlib(syst, _mixer);
-		} else {
-			void *midiTemp = detector->createMidi();
-			if (!midiTemp) {	// Fallback to Adlib
-				_imuse = IMuse::create_adlib(syst, _mixer);
-			} else {
-				_imuse = IMuse::create_midi(syst, detector->createMidi());
-			}
-		}
-
 		_imuseDigital = NULL;
-		if (detector->_gameTempo != 0)
-			_imuse->property(IMuse::PROP_TEMPO_BASE, detector->_gameTempo);
-		_imuse->set_music_volume(_sound->_sound_volume_music);
+		_imuse = IMuse::create_midi(syst, detector->createMidi());
+		if (_imuse) {
+			if (detector->_gameTempo != 0)
+				_imuse->property(IMuse::PROP_TEMPO_BASE, detector->_gameTempo);
+			_imuse->set_music_volume(_sound->_sound_volume_music);
+		}
 	}
 #endif // ph0x-hack