minor corrections

[melted] / src / modules / gtk2 / producer_pixbuf.c

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index f1f1f45..84ed6e6 100644 (file)
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -197,8 +197,11 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
        // Obtain properties of frame
        mlt_properties properties = mlt_frame_properties( *frame );
 
+       // Obtain properties of producer
+       mlt_properties producer_props = mlt_producer_properties( producer );
+
        // Get the time to live for each frame
-       double ttl = mlt_properties_get_double( mlt_producer_properties( producer ), "ttl" );
+       double ttl = mlt_properties_get_double( producer_props, "ttl" );
 
        // Image index
        int image_idx = ( int )floor( mlt_producer_position( producer ) / ttl ) % this->count;
@@ -213,6 +216,14 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
                mlt_properties_set_int( properties, "width", this->width );
                mlt_properties_set_int( properties, "height", this->height );
 
+               // Set the compositing properties
+               if ( mlt_properties_get( producer_props, "x" ) != NULL )
+                       mlt_properties_set_int( properties, "x", mlt_properties_get_int( producer_props, "x" ) );
+               if ( mlt_properties_get( producer_props, "y" ) != NULL )
+                       mlt_properties_set_int( properties, "y", mlt_properties_get_int( producer_props, "y" ) );
+               if ( mlt_properties_get( producer_props, "mix" ) != NULL )
+                       mlt_properties_set_double( properties, "mix",  mlt_properties_get_double( producer_props, "mix" ) );
+
                // if picture sequence pass the image and alpha data without destructor
                mlt_properties_set_data( properties, "image", this->image, 0, NULL, NULL );
                mlt_properties_set_data( properties, "alpha", this->alpha, 0, NULL, NULL );
@@ -292,13 +303,21 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
                mlt_properties_set_int( properties, "width", this->width );
                mlt_properties_set_int( properties, "height", this->height );
 
+               // Set the compositing properties
+               if ( mlt_properties_get( producer_props, "x" ) != NULL )
+                       mlt_properties_set_int( properties, "x", mlt_properties_get_int( producer_props, "x" ) );
+               if ( mlt_properties_get( producer_props, "y" ) != NULL )
+                       mlt_properties_set_int( properties, "y", mlt_properties_get_int( producer_props, "y" ) );
+               if ( mlt_properties_get( producer_props, "mix" ) != NULL )
+                       mlt_properties_set_double( properties, "mix",  mlt_properties_get_double( producer_props, "mix" ) );
+
                // Pass alpha and image on properties with or without destructor
                this->image = image;
                this->alpha = alpha;
 
                // pass the image and alpha data without destructor
-               mlt_properties_set_data( properties, "image", image, 0, NULL, NULL );
-               mlt_properties_set_data( properties, "alpha", alpha, 0, NULL, NULL );
+               mlt_properties_set_data( properties, "image", image, this->width * this->height * 2, NULL, NULL );
+               mlt_properties_set_data( properties, "alpha", alpha, this->width * this->height, NULL, NULL );
 
                // Set alpha call back
                ( *frame )->get_alpha_mask = producer_get_alpha_mask;