X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_types.h;h=f7100555d7b1fd54d6bafe9f8246830f73b26fab;hb=b50585d9682a132848c9f6d040c3bd1c9d6fcafc;hp=a4707c9bc002cccf8bdd02ac703bfa9a1b7b01a6;hpb=520454d526bdcd58f1ac6ab7532dc2529b822808;p=melted

diff --git a/src/framework/mlt_types.h b/src/framework/mlt_types.h
index a4707c9..f710055 100644
--- a/src/framework/mlt_types.h
+++ b/src/framework/mlt_types.h
@@ -21,8 +21,32 @@
 #ifndef _MLT_TYPES_H_
 #define _MLT_TYPES_H_
 
+#ifndef GCC_VERSION
+#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#endif
+
 #include <stdint.h>
 
+#include "mlt_pool.h"
+
+typedef enum
+{
+	mlt_image_none = 0,
+	mlt_image_rgb24,
+	mlt_image_rgb24a,
+	mlt_image_yuv422,
+	mlt_image_yuv420p,
+	mlt_image_opengl
+}
+mlt_image_format;
+
+typedef enum
+{
+	mlt_audio_none = 0,
+	mlt_audio_pcm
+}
+mlt_audio_format;
+
 typedef enum
 {
 	mlt_whence_relative_start,
@@ -31,12 +55,34 @@ typedef enum
 }
 mlt_whence;
 
-typedef int64_t mlt_position;
+typedef enum
+{
+	invalid_type,
+	unknown_type,
+	producer_type,
+	playlist_type,
+	tractor_type,
+	multitrack_type,
+	filter_type,
+	transition_type,
+	consumer_type,
+	field_type
+}
+mlt_service_type;
+
+/* I don't want to break anyone's applications without warning. -Zach */
+#undef DOUBLE_MLT_POSITION
+#ifdef DOUBLE_MLT_POSITION
+typedef double mlt_position;
+#else
+typedef int32_t mlt_position;
+#endif
+
 typedef struct mlt_frame_s *mlt_frame, **mlt_frame_ptr;
 typedef struct mlt_properties_s *mlt_properties;
+typedef struct mlt_event_struct *mlt_event;
 typedef struct mlt_service_s *mlt_service;
 typedef struct mlt_producer_s *mlt_producer;
-typedef struct mlt_manager_s *mlt_manager;
 typedef struct mlt_playlist_s *mlt_playlist;
 typedef struct mlt_multitrack_s *mlt_multitrack;
 typedef struct mlt_filter_s *mlt_filter;
@@ -44,6 +90,10 @@ typedef struct mlt_transition_s *mlt_transition;
 typedef struct mlt_tractor_s *mlt_tractor;
 typedef struct mlt_field_s *mlt_field;
 typedef struct mlt_consumer_s *mlt_consumer;
+typedef struct mlt_parser_s *mlt_parser;
+typedef struct mlt_deque_s *mlt_deque;
+typedef struct mlt_geometry_s *mlt_geometry;
+typedef struct mlt_geometry_item_s *mlt_geometry_item;
 
 typedef void ( *mlt_destructor )( void * );
 typedef char *( *mlt_serialiser )( void *, int length );
@@ -52,6 +102,7 @@ typedef char *( *mlt_serialiser )( void *, int length );
 #define MLT_PRODUCER(x) ( ( mlt_producer )( x ) )
 #define MLT_MULTITRACK(x) ( ( mlt_multitrack )( x ) )
 #define MLT_PLAYLIST(x) ( ( mlt_playlist )( x ) )
+#define MLT_TRACTOR(x) ( ( mlt_tractor )( x ) )
 #define MLT_FILTER(x) ( ( mlt_filter )( x ) )
 #define MLT_TRANSITION(x) ( ( mlt_transition )( x ) )