[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.cpp,1.17,1.18

[Drigo Zoxx]

Update of /cvsroot/scummvm/scummvm/sound
In directory usw-pr-cvs1:/tmp/cvs-serv23821

Modified Files:
	mididrv.cpp 
Log Message:
Fixed some things to support MacOS port and QuickTime

Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- mididrv.cpp	2 May 2002 14:47:17 -0000	1.17
+++ mididrv.cpp	5 May 2002 19:04:04 -0000	1.18
@@ -449,12 +449,16 @@
 
 #endif
 
-#if defined(__APPLE__) || defined(__APPLE_CW)
+#if defined(__APPLE__) || defined(macintosh)
 // FIXME - this is for Mac OS X and Mac OS 9. It's not really possible
 // to check for these *cleanly* without a configure script, though..
 
-#include <QuickTime/QuickTimeComponents.h>
-#include <QuickTime/QuickTimeMusic.h>
+
+//#include <QuickTime/QuickTimeComponents.h>
+//#include <QuickTime/QuickTimeMusic.h>
+
+#include <QuickTimeComponents.h>
+#include <QuickTimeMusic.h>
 
 
 
@@ -639,7 +643,7 @@
 	return new MidiDriver_QT();
 }
 
-#endif // __APPLE__ || __APPLE_CW
+#endif // __APPLE__ || macintosh
 
 
 #ifdef __APPLE__
@@ -809,7 +813,7 @@
 int MidiDriver::connect_to_timidity(int port)
 {
 	int s = 0;
-#if !defined(__APPLE__CW) && !defined(__MORPHOS__)	// No socket support on Apple Carbon or Morphos
+#if !defined(macintosh) && !defined(__MORPHOS__)	// No socket support on Apple Carbon or Morphos
 	struct hostent *serverhost;
 	struct sockaddr_in sadd;