X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Fconsumer_null.c;h=96183fd846e9e0b57bdf8a08ae43b93811b112a9;hb=bd2707bb370eda9cae39e22b5e89b9096474cd7d;hp=d2abe19db8a1bcdf44e6aa79a0a86e51ee1ac448;hpb=6cecd621e22006489bd1e351f4cdad13daf0dc4a;p=melted

diff --git a/src/modules/core/consumer_null.c b/src/modules/core/consumer_null.c
index d2abe19..96183fd 100644
--- a/src/modules/core/consumer_null.c
+++ b/src/modules/core/consumer_null.c
@@ -80,6 +80,7 @@ static int consumer_start( mlt_consumer this )
 
 		// Set the running state
 		mlt_properties_set_int( properties, "running", 1 );
+		mlt_properties_set_int( properties, "joined", 0 );
 
 		// Create the thread
 		pthread_create( thread, NULL, consumer_thread, this );
@@ -96,13 +97,14 @@ static int consumer_stop( mlt_consumer this )
 	mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
 
 	// Check that we're running
-	if ( mlt_properties_get_int( properties, "running" ) )
+	if ( !mlt_properties_get_int( properties, "joined" ) )
 	{
 		// Get the thread
 		pthread_t *thread = mlt_properties_get_data( properties, "thread", NULL );
 
 		// Stop the thread
 		mlt_properties_set_int( properties, "running", 0 );
+		mlt_properties_set_int( properties, "joined", 1 );
 
 		// Wait for termination
 		pthread_join( *thread, NULL );
@@ -132,15 +134,23 @@ static void *consumer_thread( void *arg )
 	// Get the properties
 	mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
 
+	// Convenience functionality
+	int terminate_on_pause = mlt_properties_get_int( properties, "terminate_on_pause" );
+	int terminated = 0;
+
 	// Frame and size
 	mlt_frame frame = NULL;
 
 	// Loop while running
-	while( mlt_properties_get_int( properties, "running" ) )
+	while( !terminated && mlt_properties_get_int( properties, "running" ) )
 	{
 		// Get the frame
 		frame = mlt_consumer_rt_frame( this );
 
+		// Check for termination
+		if ( terminate_on_pause && frame != NULL )
+			terminated = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" ) == 0.0;
+
 		// Check that we have a frame to work with
 		if ( frame != NULL )
 		{
@@ -151,6 +161,7 @@ static void *consumer_thread( void *arg )
 	}
 
 	// Indicate that the consumer is stopped
+	mlt_properties_set_int( properties, "running", 0 );
 	mlt_consumer_stopped( this );
 
 	return NULL;