X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.c;h=b03f078cda34102e596912228c7b49e7bb539cd4;hb=25f69a94909b67a20d84bc0503c954d0a491ca36;hp=2fb7dd33c597f09f3cfbc6800d6f247ea38e8373;hpb=c1c8b798d6215f20b3a3f87cd1fa2954f31d6031;p=melted

diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
index 2fb7dd3..b03f078 100644
--- a/src/framework/mlt_consumer.c
+++ b/src/framework/mlt_consumer.c
@@ -78,6 +78,9 @@ int mlt_consumer_init( mlt_consumer this, void *child )
 		// Default of all consumers is real time
 		mlt_properties_set_int( properties, "real_time", 1 );
 
+		// Default to environment test card
+		mlt_properties_set( properties, "test_card", mlt_environment( "MLT_TEST_CARD" ) );
+
 		// Hmm - default all consumers to yuv422 :-/
 		this->format = mlt_image_yuv422;
 	}
@@ -141,8 +144,7 @@ int mlt_consumer_start( mlt_consumer this )
 		if ( mlt_properties_get_data( properties, "test_card_producer", NULL ) == NULL )
 		{
 			// Create a test card producer
-			// TODO: do we want to use fezzik here?
-			mlt_producer producer = mlt_factory_producer( "fezzik", test_card );
+			mlt_producer producer = mlt_factory_producer( NULL, test_card );
 
 			// Do we have a producer
 			if ( producer != NULL )
@@ -165,6 +167,9 @@ int mlt_consumer_start( mlt_consumer this )
 		mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
 	}
 
+	// Set the real_time preference
+	this->real_time = mlt_properties_get_int( properties, "real_time" );
+
 	// Start the service
 	if ( this->start != NULL )
 		return this->start( this );
@@ -172,7 +177,7 @@ int mlt_consumer_start( mlt_consumer this )
 	return 0;
 }
 
-/** Protected method :-/ for consumer to get frames from connected service
+/** Protected method for consumer to get frames from connected service
 */
 
 mlt_frame mlt_consumer_get_frame( mlt_consumer this )
@@ -335,7 +340,6 @@ static void consumer_read_ahead_start( mlt_consumer this )
 	
 	// Create the read ahead 
 	pthread_create( &this->ahead_thread, &thread_attributes, consumer_read_ahead_thread, this );
-
 }
 
 static void consumer_read_ahead_stop( mlt_consumer this )
@@ -375,7 +379,7 @@ mlt_frame mlt_consumer_rt_frame( mlt_consumer this )
 	mlt_properties properties = mlt_consumer_properties( this );
 
 	// Check if the user has requested real time or not
-	if ( mlt_properties_get_int( properties, "real_time" ) )
+	if ( this->real_time )
 	{
 		int size = 1;