X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Fconsumer_null.c;h=96183fd846e9e0b57bdf8a08ae43b93811b112a9;hb=3b33a072eba3428710b5a1c86409fc99cbb2d2bc;hp=57452e134d096b5c0ab0bb34fa5216e0e4e45081;hpb=55f4b82288ba162eeeedf63bbb99455cccd04b8d;p=melted

diff --git a/src/modules/core/consumer_null.c b/src/modules/core/consumer_null.c
index 57452e1..96183fd 100644
--- a/src/modules/core/consumer_null.c
+++ b/src/modules/core/consumer_null.c
@@ -67,27 +67,23 @@ mlt_consumer consumer_null_init( char *arg )
 static int consumer_start( mlt_consumer this )
 {
 	// Get the properties
-	mlt_properties properties = mlt_consumer_properties( this );
+	mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
 
 	// Check that we're not already running
 	if ( !mlt_properties_get_int( properties, "running" ) )
 	{
 		// Allocate a thread
 		pthread_t *thread = calloc( 1, sizeof( pthread_t ) );
-		pthread_attr_t thread_attributes;
 
 		// Assign the thread to properties
 		mlt_properties_set_data( properties, "thread", thread, sizeof( pthread_t ), free, NULL );
 
 		// Set the running state
 		mlt_properties_set_int( properties, "running", 1 );
+		mlt_properties_set_int( properties, "joined", 0 );
 
-		// Inherit the scheduling priority
-		pthread_attr_init( &thread_attributes );
-		pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED );
-		
 		// Create the thread
-		pthread_create( thread, &thread_attributes, consumer_thread, this );
+		pthread_create( thread, NULL, consumer_thread, this );
 	}
 	return 0;
 }
@@ -98,16 +94,17 @@ static int consumer_start( mlt_consumer this )
 static int consumer_stop( mlt_consumer this )
 {
 	// Get the properties
-	mlt_properties properties = mlt_consumer_properties( 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 );
@@ -122,7 +119,7 @@ static int consumer_stop( mlt_consumer this )
 static int consumer_is_stopped( mlt_consumer this )
 {
 	// Get the properties
-	mlt_properties properties = mlt_consumer_properties( this );
+	mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
 	return !mlt_properties_get_int( properties, "running" );
 }
 
@@ -135,17 +132,25 @@ static void *consumer_thread( void *arg )
 	mlt_consumer this = arg;
 
 	// Get the properties
-	mlt_properties properties = mlt_consumer_properties( this );
+	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 )
 		{
@@ -156,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;