[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.66,2.67

Chris Apers chrilith at users.sourceforge.net
Tue Jun 17 01:51:13 CEST 2003


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

Modified Files:
	imuse.cpp 
Log Message:
I will add a wrapper for that (currently NULL driver)

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.66
retrieving revision 2.67
diff -u -d -r2.66 -r2.67
--- imuse.cpp	15 Jun 2003 01:42:14 -0000	2.66
+++ imuse.cpp	17 Jun 2003 08:50:15 -0000	2.67
@@ -74,7 +74,6 @@
 
 	if (_midi_native) {
 		driver = _midi_native;
-#if !defined(__PALM_OS__) // Adlib not supported on PalmOS
 	} else {
 		// Route it through Adlib anyway.
 		if (!_midi_adlib) {
@@ -82,7 +81,6 @@
 			initMidiDriver (_midi_adlib);
 		}
 		driver = _midi_adlib;
-#endif
 	}
 
 	return driver;
@@ -184,7 +182,6 @@
 	if (isGM (sound)) {
 		if (_midi_native) {
 			driver = _midi_native;
-#if !defined(__PALM_OS__) // Adlib not supported on PalmOS
 		} else {
 			// Route it through Adlib anyway.
 			if (!_midi_adlib) {
@@ -192,16 +189,13 @@
 				initMidiDriver (_midi_adlib);
 			}
 			driver = _midi_adlib;
-#endif
 		}
-#if !defined(__PALM_OS__) // Adlib not supported on PalmOS
 	} else {
 		if (!_midi_adlib && (_enable_multi_midi || !_midi_native)) {
 			_midi_adlib = MidiDriver_ADLIB_create();
 			initMidiDriver (_midi_adlib);
 		}
 		driver = _midi_adlib;
-#endif
 	}
 	return driver;
 }





More information about the Scummvm-git-logs mailing list