Fix related to #29694: quicktime export was not showing or respecting RGBA
[blender.git] / source / blender / quicktime / quicktime_import.h
index 1444827e12e679140a124c6372c7b8a2c0ee1475..d095b8353ca5abfdd235bba5f2f40051ac6d2e3a 100644 (file)
@@ -1,7 +1,6 @@
-/**
+/*
  * Quicktime_import.h
  *
- * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -17,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * The Original Code is Copyright (C) 2002-2003 by TNCCI Inc.
  * All rights reserved.
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file blender/quicktime/quicktime_import.h
+ *  \ingroup quicktime
+ */
+
+
 
 #ifndef __QUICKTIME_IMP_H__
 #define __QUICKTIME_IMP_H__
 
 #define __AIFF__
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #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__
 #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);
 
 
 // quicktime movie import functions
 
-int            anim_is_quicktime (char *name);
+int            anim_is_quicktime (const char *name);
 int            startquicktime (struct anim *anim);
 void   free_anim_quicktime (struct anim *anim);
 ImBuf  *qtime_fetchibuf (struct anim *anim, int position);
@@ -99,4 +76,4 @@ ImBuf  *qtime_fetchibuf (struct anim *anim, int position);
 int            imb_is_a_quicktime (char *name);
 ImBuf  *imb_quicktime_decode(unsigned char *mem, int size, int flags);
 
-#endif  // __QUICKTIME_IMP_H__
\ No newline at end of file
+#endif  // __QUICKTIME_IMP_H__