X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.h;h=c2a473610bc678d54be882eefb35c1aa56a732e6;hb=eabc3498604fc7983bbd805d40dad2e7df135f17;hp=287987250a943da0e6d59e9d654e177e402cc9c8;hpb=5b59ce704d4f317e845afa30c5ade12c0fd22d43;p=melted

diff --git a/src/framework/mlt_producer.h b/src/framework/mlt_producer.h
index 2879872..c2a4736 100644
--- a/src/framework/mlt_producer.h
+++ b/src/framework/mlt_producer.h
@@ -22,6 +22,7 @@
 #define _MLT_PRODUCER_H_
 
 #include "mlt_service.h"
+#include "mlt_filter.h"
 
 /** The interface definition for all producers.
 */
@@ -33,32 +34,46 @@ struct mlt_producer_s
 
 	// Public virtual methods
 	int ( *get_frame )( mlt_producer, mlt_frame_ptr, int );
-	void ( *close )( mlt_producer );
+	mlt_destructor close;
+	void *close_object;
 
 	// Private data
-	void *private;
+	void *local;
 	void *child;
 };
 
 /** Public final methods
 */
 
-extern int mlt_producer_init( mlt_producer this, void *child );
+#define MLT_PRODUCER_SERVICE( producer )	( &( producer )->parent )
+#define MLT_PRODUCER_PROPERTIES( producer )	MLT_SERVICE_PROPERTIES( MLT_PRODUCER_SERVICE( producer ) )
+
+extern int mlt_producer_init( mlt_producer self, void *child );
 extern mlt_producer mlt_producer_new( );
-extern mlt_service mlt_producer_service( mlt_producer this );
-extern mlt_properties mlt_producer_properties( mlt_producer this );
-extern int mlt_producer_seek( mlt_producer this, mlt_position position );
-extern mlt_position mlt_producer_position( mlt_producer this );
-extern mlt_position mlt_producer_frame( mlt_producer this );
-extern int mlt_producer_set_speed( mlt_producer this, double speed );
-extern double mlt_producer_get_speed( mlt_producer this );
-extern double mlt_producer_get_fps( mlt_producer this );
-extern int mlt_producer_set_in_and_out( mlt_producer this, mlt_position in, mlt_position out );
-extern mlt_position mlt_producer_get_in( mlt_producer this );
-extern mlt_position mlt_producer_get_out( mlt_producer this );
-extern mlt_position mlt_producer_get_playtime( mlt_producer this );
-extern mlt_position mlt_producer_get_length( mlt_producer this );
-extern void mlt_producer_prepare_next( mlt_producer this );
-extern void mlt_producer_close( mlt_producer this );
+extern mlt_service mlt_producer_service( mlt_producer self );
+extern mlt_properties mlt_producer_properties( mlt_producer self );
+extern int mlt_producer_seek( mlt_producer self, mlt_position position );
+extern mlt_position mlt_producer_position( mlt_producer self );
+extern mlt_position mlt_producer_frame( mlt_producer self );
+extern int mlt_producer_set_speed( mlt_producer self, double speed );
+extern double mlt_producer_get_speed( mlt_producer self );
+extern double mlt_producer_get_fps( mlt_producer self );
+extern int mlt_producer_set_in_and_out( mlt_producer self, mlt_position in, mlt_position out );
+extern int mlt_producer_clear( mlt_producer self );
+extern mlt_position mlt_producer_get_in( mlt_producer self );
+extern mlt_position mlt_producer_get_out( mlt_producer self );
+extern mlt_position mlt_producer_get_playtime( mlt_producer self );
+extern mlt_position mlt_producer_get_length( mlt_producer self );
+extern void mlt_producer_prepare_next( mlt_producer self );
+extern int mlt_producer_attach( mlt_producer self, mlt_filter filter );
+extern int mlt_producer_detach( mlt_producer self, mlt_filter filter );
+extern mlt_filter mlt_producer_filter( mlt_producer self, int index );
+extern mlt_producer mlt_producer_cut( mlt_producer self, int in, int out );
+extern int mlt_producer_is_cut( mlt_producer self );
+extern int mlt_producer_is_mix( mlt_producer self );
+extern int mlt_producer_is_blank( mlt_producer self );
+extern mlt_producer mlt_producer_cut_parent( mlt_producer self );
+extern int mlt_producer_optimise( mlt_producer self );
+extern void mlt_producer_close( mlt_producer self );
 
 #endif