X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=9ae6d798b568951dc9e4ae5c07ce76d4a3528878;hb=0942454258a07166839a999c71b6fa35785ac70a;hp=f4e5bd591f86333027db308d0e13f1853cf55938;hpb=1d46befd8150131541aa98e93573d5d6e54e9c3a;p=melted

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index f4e5bd5..9ae6d79 100644
--- a/src/framework/mlt_producer.c
+++ b/src/framework/mlt_producer.c
@@ -36,38 +36,46 @@ static int producer_get_frame( mlt_service this, mlt_frame_ptr frame, int index
 
 int mlt_producer_init( mlt_producer this, void *child )
 {
-	// Initialise the producer
-	memset( this, 0, sizeof( struct mlt_producer_s ) );
-	
-	// Associate with the child
-	this->child = child;
+	// Check that we haven't received NULL
+	int error = this == NULL;
 
-	// Initialise the service
-	if ( mlt_service_init( &this->parent, this ) == 0 )
+	// Continue if no error
+	if ( error == 0 )
 	{
-		// The parent is the service
-		mlt_service parent = &this->parent;
-
-		// Get the properties of the parent
-		mlt_properties properties = mlt_service_properties( parent );
-
-		// Set the default properties
-		mlt_properties_set( properties, "mlt_type", "mlt_producer" );
-		mlt_properties_set_position( properties, "position", 0.0 );
-		mlt_properties_set_double( properties, "frame", 0 );
-		mlt_properties_set_double( properties, "fps", 25.0 );
-		mlt_properties_set_double( properties, "speed", 1.0 );
-		mlt_properties_set_position( properties, "in", 0 );
-		mlt_properties_set_position( properties, "out", 1799999 );
-		mlt_properties_set_position( properties, "length", 1800000 );
-		mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 );
-		mlt_properties_set( properties, "log_id", "multitrack" );
-
-		// Override service get_frame
-		parent->get_frame = producer_get_frame;
+		// Initialise the producer
+		memset( this, 0, sizeof( struct mlt_producer_s ) );
+	
+		// Associate with the child
+		this->child = child;
+
+		// Initialise the service
+		if ( mlt_service_init( &this->parent, this ) == 0 )
+		{
+			// The parent is the service
+			mlt_service parent = &this->parent;
+	
+			// Get the properties of the parent
+			mlt_properties properties = mlt_service_properties( parent );
+	
+			// Set the default properties
+			mlt_properties_set( properties, "mlt_type", "mlt_producer" );
+			mlt_properties_set_position( properties, "_position", 0.0 );
+			mlt_properties_set_double( properties, "_frame", 0 );
+			mlt_properties_set_double( properties, "fps", 25.0 );
+			mlt_properties_set_double( properties, "_speed", 1.0 );
+			mlt_properties_set_position( properties, "in", 0 );
+			mlt_properties_set_position( properties, "out", 1799999 );
+			mlt_properties_set_position( properties, "length", 1800000 );
+			mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 );
+			mlt_properties_set( properties, "eof", "pause" );
+			mlt_properties_set( properties, "resource", "<producer>" );
+
+			// Override service get_frame
+			parent->get_frame = producer_get_frame;
+		}
 	}
 
-	return 0;
+	return error;
 }
 
 /** Get the parent service object.
@@ -91,17 +99,20 @@ mlt_properties mlt_producer_properties( mlt_producer this )
 
 int mlt_producer_seek( mlt_producer this, mlt_position position )
 {
+	// Determine eof handling
+	char *eof = mlt_properties_get( mlt_producer_properties( this ), "eof" );
+
 	// Check bounds
 	if ( position < 0 )
 		position = 0;
-	else if ( position > mlt_producer_get_playtime( this ) )
+	else if ( !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) )
 		position = mlt_producer_get_playtime( this ) - 1;
 
 	// Set the position
-	mlt_properties_set_position( mlt_producer_properties( this ), "position", position );
+	mlt_properties_set_position( mlt_producer_properties( this ), "_position", position );
 
 	// Calculate the absolute frame
-	mlt_properties_set_position( mlt_producer_properties( this ), "frame", mlt_producer_get_in( this ) + position );
+	mlt_properties_set_position( mlt_producer_properties( this ), "_frame", mlt_producer_get_in( this ) + position );
 
 	return 0;
 }
@@ -111,7 +122,7 @@ int mlt_producer_seek( mlt_producer this, mlt_position position )
 
 mlt_position mlt_producer_position( mlt_producer this )
 {
-	return mlt_properties_get_position( mlt_producer_properties( this ), "position" );
+	return mlt_properties_get_position( mlt_producer_properties( this ), "_position" );
 }
 
 /** Get the current position (relative to start of producer).
@@ -119,7 +130,7 @@ mlt_position mlt_producer_position( mlt_producer this )
 
 mlt_position mlt_producer_frame( mlt_producer this )
 {
-	return mlt_properties_get_double( mlt_producer_properties( this ), "frame" );
+	return mlt_properties_get_position( mlt_producer_properties( this ), "_frame" );
 }
 
 /** Set the playing speed.
@@ -127,7 +138,7 @@ mlt_position mlt_producer_frame( mlt_producer this )
 
 int mlt_producer_set_speed( mlt_producer this, double speed )
 {
-	return mlt_properties_set_double( mlt_producer_properties( this ), "speed", speed );
+	return mlt_properties_set_double( mlt_producer_properties( this ), "_speed", speed );
 }
 
 /** Get the playing speed.
@@ -135,7 +146,7 @@ int mlt_producer_set_speed( mlt_producer this, double speed )
 
 double mlt_producer_get_speed( mlt_producer this )
 {
-	return mlt_properties_get_double( mlt_producer_properties( this ), "speed" );
+	return mlt_properties_get_double( mlt_producer_properties( this ), "_speed" );
 }
 
 /** Get the frames per second.
@@ -214,7 +225,7 @@ mlt_position mlt_producer_get_length( mlt_producer this )
 
 void mlt_producer_prepare_next( mlt_producer this )
 {
-	mlt_producer_seek( this, mlt_producer_frame( this ) + mlt_producer_get_speed( this ) );
+	mlt_producer_seek( this, mlt_producer_position( this ) + mlt_producer_get_speed( this ) );
 }
 
 /** Get a frame.
@@ -225,13 +236,13 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
 	int result = 1;
 	mlt_producer this = service->child;
 
+	// Determine eof handling
+	char *eof = mlt_properties_get( mlt_producer_properties( this ), "eof" );
+
 	// A properly instatiated producer will have a get_frame method...
-	if ( this->get_frame != NULL )
-	{
-		// Get the frame from the implementation
-		result = this->get_frame( this, frame, index );
-	}
-	else
+//fprintf( stderr, "PRODUCER get_frame %p eof %s pos %lld out %lld\n",
+//this->get_frame, eof, mlt_producer_position( this ), mlt_producer_get_out( this ) );
+	if ( this->get_frame == NULL || ( !strcmp( eof, "continue" ) && mlt_producer_position( this ) > mlt_producer_get_out( this ) ) )
 	{
 		// Generate a test frame
 		*frame = mlt_frame_init( );
@@ -242,12 +253,17 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
 		// Calculate the next position
 		mlt_producer_prepare_next( this );
 	}
+	else
+	{
+		// Get the frame from the implementation
+		result = this->get_frame( this, frame, index );
+	}
 
 	// Copy the fps and speed of the producer onto the frame
 	mlt_properties properties = mlt_frame_properties( *frame );
 	mlt_properties_set_double( properties, "fps", mlt_producer_get_fps( this ) );
 	double speed = mlt_producer_get_speed( this );
-	mlt_properties_set_double( properties, "speed", speed );
+	mlt_properties_set_double( properties, "_speed", speed );
 
 	return 0;
 }