X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.h;h=82a08b42ce08e7b2805eb55340465272a13ceb7d;hb=c95736fd9ee742f5e6db06bbe579f23895f55eba;hp=e718912cafe01f047659fb6bd8a353c713afd9bb;hpb=f2dda0fcd1c242afcd07f2c2ef98f8f6b3fb0e13;p=melted

diff --git a/src/framework/mlt_consumer.h b/src/framework/mlt_consumer.h
index e718912..82a08b4 100644
--- a/src/framework/mlt_consumer.h
+++ b/src/framework/mlt_consumer.h
@@ -39,7 +39,7 @@ struct mlt_consumer_s
 	void ( *close )( mlt_consumer );
 
 	// Private data
-	void *private;
+	void *local;
 	void *child;
 
 	int real_time;
@@ -49,21 +49,32 @@ struct mlt_consumer_s
 	pthread_t ahead_thread;
 	pthread_mutex_t mutex;
 	pthread_cond_t cond;
+	pthread_mutex_t put_mutex;
+	pthread_cond_t put_cond;
+	mlt_frame put;
+	int put_active;
 };
 
 /** Public final methods
 */
 
-extern int mlt_consumer_init( mlt_consumer this, void *child );
+#define MLT_CONSUMER_SERVICE( consumer )	( &( consumer )->parent )
+#define MLT_CONSUMER_PROPERTIES( consumer )	MLT_SERVICE_PROPERTIES( MLT_CONSUMER_SERVICE( consumer ) )
+
+extern int mlt_consumer_init( mlt_consumer self, void *child );
 extern mlt_consumer mlt_consumer_new( );
-extern mlt_service mlt_consumer_service( mlt_consumer this );
-extern mlt_properties mlt_consumer_properties( mlt_consumer this );
-extern int mlt_consumer_connect( mlt_consumer this, mlt_service producer );
-extern int mlt_consumer_start( mlt_consumer this );
-extern mlt_frame mlt_consumer_get_frame( mlt_consumer this );
-extern mlt_frame mlt_consumer_rt_frame( mlt_consumer this );
-extern int mlt_consumer_stop( mlt_consumer this );
-extern int mlt_consumer_is_stopped( mlt_consumer this );
+extern mlt_service mlt_consumer_service( mlt_consumer self );
+extern mlt_properties mlt_consumer_properties( mlt_consumer self );
+extern int mlt_consumer_connect( mlt_consumer self, mlt_service producer );
+extern int mlt_consumer_start( mlt_consumer self );
+extern void mlt_consumer_purge( mlt_consumer self );
+extern int mlt_consumer_put_frame( mlt_consumer self, mlt_frame frame );
+extern mlt_frame mlt_consumer_get_frame( mlt_consumer self );
+extern mlt_frame mlt_consumer_rt_frame( mlt_consumer self );
+extern int mlt_consumer_stop( mlt_consumer self );
+extern int mlt_consumer_is_stopped( mlt_consumer self );
+extern void mlt_consumer_stopped( mlt_consumer self );
 extern void mlt_consumer_close( mlt_consumer );
+extern int mlt_consumer_profile( mlt_properties properties, char *profile );
 
 #endif