X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_types.h;h=50baba6d2dfcc7e3bda0c2d8287dd00250612e33;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=162602f6f1f8ebb8ed68f352deee2435bb2d7161;hpb=7c518e80321a87a22d2e48835442c9f5b70dcd17;p=melted

diff --git a/src/framework/mlt_types.h b/src/framework/mlt_types.h
index 162602f..50baba6 100644
--- a/src/framework/mlt_types.h
+++ b/src/framework/mlt_types.h
@@ -3,26 +3,50 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * 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.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #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,9 +90,20 @@ 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 );
 
+#define MLT_SERVICE(x) ( ( mlt_service )( x ) )
+#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 ) )
 
 #endif