Quicktime for Cocoa : import part

This makes quicktime import (.mov & quicktime handled image files such as .gif) available also for 64bit OSX

Unfortunately, Apple currently incomplete implementation of QTKit has much lower performance than old Carbon Quicktime.
FYI, it spawns a 32bit process "QTKitserver" to place calls to Quicktime 7.

So this is mostly meant as a "backup" for 64bit OSX builds, until Apple releases full Quicktime X.

Export part will come just after.

CMake scripts updated: set WITH_QUICKTIME and USE_QTKIT to ON

1 files changed, 3 insertions, 26 deletions

diff --git a/source/blender/quicktime/quicktime_import.h b/source/blender/quicktime/quicktime_import.h
index 1444827e12e..6dea5956195 100644
--- a/source/blender/quicktime/quicktime_import.h
+++ b/source/blender/quicktime/quicktime_import.h
@@ -42,6 +42,7 @@
 #include "../imbuf/IMB_imbuf.h"
 #include "../imbuf/IMB_imbuf_types.h"
 
+#ifndef USE_QTKIT
 #ifndef __MOVIES__
 #ifdef _WIN32
 #include <Movies.h>
@@ -50,7 +51,8 @@
 #import <Carbon/Carbon.h>
 #include <QuickTime/Movies.h>
 #endif
-#endif
+#endif //__MOVIES__
+#endif //USE_QTKIT
 
 #ifdef _WIN32
 #ifndef __FIXMATH__
@@ -58,31 +60,6 @@
 #endif /* __FIXMATH__ */
 #endif /* _WIN32 _ */
 
-// quicktime structure definition
-// this structure is part of the anim struct
-
-typedef struct _QuicktimeMovie {
-	GWorldPtr	offscreenGWorld;
-	PixMapHandle	offscreenPixMap;
-
-	Movie		movie;
-	short		movieRefNum;
-	short		movieResId;
-	int			movWidth, movHeight;
-	Rect		movieBounds;
-
-	int			framecount;
-
-	TimeValue	*frameIndex;
-	ImBuf		*ibuf;
-
-	Media		theMedia;
-	Track		theTrack;
-	long		trackIndex;
-	short		depth;
-
-	int			have_gw;	//ugly
-} QuicktimeMovie;
 
 char *get_valid_qtname(char *name);