moved Quicktime init function from creator.c

3 files changed, 40 insertions, 30 deletions

diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index 059e7353c3f..0e77fe2b73d 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -515,4 +515,14 @@ void IMB_freezbufImBuf(struct ImBuf * ibuf);
  */
 void IMB_rectfill(unsigned int *drect, unsigned int *srect, int x, int value);
 
+
+#ifdef WITH_QUICKTIME
+/**
+ *
+ * @attention Defined in quicktime_import.c
+ */
+void init_quicktime(void);
+
+#endif //WITH_QUICKTIME
+
 #endif
diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c
index 42cd9407782..eeaa8c4189e 100644
--- a/source/blender/quicktime/apple/quicktime_import.c
+++ b/source/blender/quicktime/apple/quicktime_import.c
@@ -36,6 +36,7 @@
 
 #include "IMB_anim.h"
 #include "BLO_sys_types.h"
+#include "BKE_global.h"
 
 #ifdef __APPLE__
 #include <QuickTime/Movies.h>
@@ -58,6 +59,28 @@
 #define QTIME_DEBUG 0
 
 
+void init_quicktime(void)
+{
+#ifdef _WIN32
+        if (InitializeQTML(0) != noErr)
+            G.have_quicktime = FALSE;
+        else
+            G.have_quicktime = TRUE;
+#endif /* _WIN32 */
+
+        /* Initialize QuickTime */
+#if defined(_WIN32) || defined (__APPLE__)
+        if (EnterMovies() != noErr)
+            G.have_quicktime = FALSE;
+        else
+#endif /* _WIN32 || __APPLE__ */
+#ifdef __linux__
+			/* inititalize quicktime codec registry */
+			lqt_registry_init();
+#endif
+			G.have_quicktime = TRUE;
+}
+
 int anim_is_quicktime (char *name)
 {
 	FSSpec	theFSSpec;
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 04e2c9b95ea..89f4d1078ba 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -75,6 +75,8 @@
 
 #include "BDR_drawmesh.h"
 
+#include "IMB_imbuf.h"
+
 #include "RE_renderconverter.h"
 
 #include "playanim_ext.h"
@@ -94,16 +96,6 @@
   #endif
 #endif
 
-#ifdef WITH_QUICKTIME
-#ifdef _WIN32
-#include <QTML.h>
-#include <Movies.h>
-#elif defined(__APPLE__)
-#undef NDEBUG
-#include <QuickTime/Movies.h>
-#endif /* __APPLE__ */
-#endif /* WITH_QUICKTIME */
-
 // from buildinfo.c
 extern char * build_date;
 extern char * build_time;
@@ -431,27 +423,12 @@ int main(int argc, char **argv)
 	RE_init_filt_mask();
 	
 #ifdef WITH_QUICKTIME
-#ifdef _WIN32
-        if (InitializeQTML(0) != noErr)
-            G.have_quicktime = FALSE;
-        else
-            G.have_quicktime = TRUE;
-#endif /* _WIN32 */
-
-        /* Initialize QuickTime */
-#if defined(_WIN32) || defined (__APPLE__)
-        if (EnterMovies() != noErr)
-            G.have_quicktime = FALSE;
-        else
-#endif /* _WIN32 || __APPLE__ */
-#ifdef __linux__
-			/* inititalize quicktime codec registry */
-			lqt_registry_init();
-#endif
-			G.have_quicktime = TRUE;
-#endif /* WITH_QUICKTIME */
 
-		/* OK we are ready for it */
+	init_quicktime();
+
+#endif /* WITH_QUICKTIME */
+		
+	/* OK we are ready for it */
 
 	for(a=1; a<argc; a++) {
 		if (G.afbreek==1) break;