bugfixes

[mlt] / src / framework / mlt_producer.c

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index 21f527746692595142b6e5757227511b021da17d..9ae6d798b568951dc9e4ae5c07ce76d4a3528878 100644 (file)
--- a/src/framework/mlt_producer.c
+++ b/src/framework/mlt_producer.c
@@ -36,39 +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, "eof", "pause" );
-               mlt_properties_set( properties, "resource", "<producer>" );
-
-               // 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.
@@ -102,10 +109,10 @@ int mlt_producer_seek( mlt_producer this, mlt_position position )
                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;
 }
@@ -115,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).
@@ -123,7 +130,7 @@ mlt_position mlt_producer_position( mlt_producer this )
 
 mlt_position mlt_producer_frame( mlt_producer this )
 {
-       return mlt_properties_get_position( mlt_producer_properties( this ), "frame" );
+       return mlt_properties_get_position( mlt_producer_properties( this ), "_frame" );
 }
 
 /** Set the playing speed.
@@ -131,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.
@@ -139,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.
@@ -233,6 +240,8 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
        char *eof = mlt_properties_get( mlt_producer_properties( this ), "eof" );
 
        // A properly instatiated producer will have a get_frame method...
+//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
@@ -254,7 +263,7 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
        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;
 }