titles and global feeds

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

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index 4cd7a4c..a37d6e9 100644 (file)
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -25,12 +25,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <pthread.h>
 #include <math.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
 
+pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER;
+
 typedef struct producer_pixbuf_s *producer_pixbuf;
 
 struct producer_pixbuf_s
@@ -67,7 +70,7 @@ mlt_producer producer_pixbuf_init( char *filename )
                mlt_producer producer = &this->parent;
 
                // Get the properties interface
-               mlt_properties properties = mlt_producer_properties( &this->parent );
+               mlt_properties properties = MLT_PRODUCER_PROPERTIES( &this->parent );
        
                // Callback registration
                producer->get_frame = producer_get_frame;
@@ -77,9 +80,6 @@ mlt_producer producer_pixbuf_init( char *filename )
                mlt_properties_set( properties, "resource", filename );
                mlt_properties_set_int( properties, "ttl", 25 );
                
-               // Initialise gobject types
-               g_type_init();
-
                return producer;
        }
        free( this );
@@ -93,7 +93,7 @@ static void refresh_image( mlt_frame frame, int width, int height )
        GError *error = NULL;
 
        // Obtain properties of frame
-       mlt_properties properties = mlt_frame_properties( frame );
+       mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
 
        // Obtain the producer for this frame
        producer_pixbuf this = mlt_properties_get_data( properties, "producer_pixbuf", NULL );
@@ -102,7 +102,7 @@ static void refresh_image( mlt_frame frame, int width, int height )
        mlt_producer producer = &this->parent;
 
        // Obtain properties of producer
-       mlt_properties producer_props = mlt_producer_properties( producer );
+       mlt_properties producer_props = MLT_PRODUCER_PROPERTIES( producer );
 
        // Get the time to live for each frame
        double ttl = mlt_properties_get_int( producer_props, "ttl" );
@@ -113,6 +113,8 @@ static void refresh_image( mlt_frame frame, int width, int height )
        // Image index
        int image_idx = ( int )floor( ( double )position / ttl ) % this->count;
 
+       pthread_mutex_lock( &fastmutex );
+
     // optimization for subsequent iterations on single picture
        if ( width != 0 && this->image != NULL && image_idx == this->image_idx )
        {
@@ -206,12 +208,14 @@ static void refresh_image( mlt_frame frame, int width, int height )
        // pass the image data without destructor
        mlt_properties_set_data( properties, "image", this->image, this->width * ( this->height + 1 ) * 2, NULL, NULL );
        mlt_properties_set_data( properties, "alpha", this->alpha, this->width * this->height, NULL, NULL );
+
+       pthread_mutex_unlock( &fastmutex );
 }
 
 static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
 {
        // Obtain properties of frame
-       mlt_properties properties = mlt_frame_properties( frame );
+       mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
 
        *width = mlt_properties_get_int( properties, "rescale_width" );
        *height = mlt_properties_get_int( properties, "rescale_height" );
@@ -262,7 +266,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 static uint8_t *producer_get_alpha_mask( mlt_frame this )
 {
        // Obtain properties of frame
-       mlt_properties properties = mlt_frame_properties( this );
+       mlt_properties properties = MLT_FRAME_PROPERTIES( this );
 
        // Return the alpha mask
        return mlt_properties_get_data( properties, "alpha", NULL );
@@ -273,9 +277,9 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
        // Get the real structure for this producer
        producer_pixbuf this = producer->child;
 
-       if ( this->count == 0 && mlt_properties_get( mlt_producer_properties( producer ), "resource" ) != NULL )
+       if ( this->count == 0 && mlt_properties_get( MLT_PRODUCER_PROPERTIES( producer ), "resource" ) != NULL )
        {
-               mlt_properties properties = mlt_producer_properties( producer );
+               mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
                char *filename = mlt_properties_get( properties, "resource" );
                
                // Read xml string
@@ -372,7 +376,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
        if ( *frame != NULL && this->count > 0 )
        {
                // Obtain properties of frame and producer
-               mlt_properties properties = mlt_frame_properties( *frame );
+               mlt_properties properties = MLT_FRAME_PROPERTIES( *frame );
 
                // Determine if we're rendering for PAL or NTSC
                int is_pal = mlt_properties_get_int( properties, "normalised_height" ) == 576;