X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.c;h=2ba290133d63d4445b529b05f57fe27bc6376766;hb=ebcbb3571620a43fe24b3f8fa0161096ef628dbe;hp=1b67b7414516d048c1b4ea9fcc1d153e14616bd9;hpb=b59235cf232be9d06a0eef478e0cd4a93a36cb58;p=melted

diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
index 1b67b74..2ba2901 100644
--- a/src/framework/mlt_consumer.c
+++ b/src/framework/mlt_consumer.c
@@ -28,6 +28,8 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
+static void mlt_consumer_frame_show( mlt_listener listener, mlt_properties owner, mlt_service this, void **args );
+
 /** Public final methods
 */
 
@@ -83,10 +85,19 @@ int mlt_consumer_init( mlt_consumer this, void *child )
 
 		// Hmm - default all consumers to yuv422 :-/
 		this->format = mlt_image_yuv422;
+
+		mlt_events_register( properties, "consumer-frame-show", ( mlt_transmitter )mlt_consumer_frame_show );
+		mlt_events_register( properties, "consumer-stopped", NULL );
 	}
 	return error;
 }
 
+static void mlt_consumer_frame_show( mlt_listener listener, mlt_properties owner, mlt_service this, void **args )
+{
+	if ( listener != NULL )
+		listener( owner, this, ( mlt_frame )args[ 0 ] );
+}
+
 /** Create a new consumer.
 */
 
@@ -209,8 +220,8 @@ mlt_frame mlt_consumer_get_frame( mlt_consumer this )
 
 		// Aspect ratio and other jiggery pokery
 		mlt_properties_set_double( frame_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) );
-		mlt_properties_set_int( frame_properties, "consumer_progressive", mlt_properties_get_int( properties, "progressive" ) );
-		mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_int( properties, "deinterlace" ) );
+		if ( mlt_properties_get_int( properties, "progressive" ) || mlt_properties_get_int( properties, "deinterlace" ) )
+			mlt_properties_set_int( frame_properties, "consumer_deinterlace", 1 );
 	}
 
 	// Return the frame
@@ -422,6 +433,18 @@ static void consumer_read_ahead_stop( mlt_consumer this )
 	}
 }
 
+void mlt_consumer_purge( mlt_consumer this )
+{
+	if ( this->ahead )
+	{
+		pthread_mutex_lock( &this->mutex );
+		while ( mlt_deque_count( this->queue ) )
+			mlt_frame_close( mlt_deque_pop_back( this->queue ) );
+		pthread_cond_broadcast( &this->cond );
+		pthread_mutex_unlock( &this->mutex );
+	}
+}
+
 mlt_frame mlt_consumer_rt_frame( mlt_consumer this )
 {
 	// Frame to return
@@ -465,6 +488,15 @@ mlt_frame mlt_consumer_rt_frame( mlt_consumer this )
 	return frame;
 }
 
+/** Callback for the implementation to indicate a stopped condition.
+*/
+
+void mlt_consumer_stopped( mlt_consumer this )
+{
+	mlt_properties_set_int( mlt_consumer_properties( this ), "running", 0 );
+	mlt_events_fire( mlt_consumer_properties( this ), "consumer-stopped", NULL );
+}
+
 /** Stop the consumer.
 */
 
@@ -508,15 +540,19 @@ int mlt_consumer_is_stopped( mlt_consumer this )
 
 void mlt_consumer_close( mlt_consumer this )
 {
-	// Get the childs close function
-	void ( *consumer_close )( ) = this->close;
+	if ( this != NULL && mlt_properties_dec_ref( mlt_consumer_properties( this ) ) <= 0 )
+	{
+		// Get the childs close function
+		void ( *consumer_close )( ) = this->close;
 
-	// Make sure it only gets called once
-	this->close = NULL;
+		// Make sure it only gets called once
+		this->close = NULL;
+		this->parent.close = NULL;
 
-	// Call the childs close if available
-	if ( consumer_close != NULL )
-		consumer_close( this );
-	else
-		mlt_service_close( &this->parent );
+		// Call the childs close if available
+		if ( consumer_close != NULL )
+			consumer_close( this );
+		else
+			mlt_service_close( &this->parent );
+	}
 }