producer_pixbuf.c, producer_qimage.c, producer_sdl_image.c: bugfix (kdenlive-422...
[melted] / src / modules / qimage / producer_qimage.c
index 302bca0..bd3b0ea 100644 (file)
@@ -21,7 +21,7 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "producer_qimage.h"
+#include <framework/mlt_producer.h>
 #include "qimage_wrapper.h"
 
 #include <stdio.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
+static void load_filenames( producer_qimage this, mlt_properties producer_properties );
 static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int index );
 static void producer_close( mlt_producer parent );
 
-mlt_producer producer_qimage_init( char *filename )
+mlt_producer producer_qimage_init( mlt_profile profile, mlt_service_type type, const char *id, char *filename )
 {
        producer_qimage this = calloc( sizeof( struct producer_qimage_s ), 1 );
        if ( this != NULL && mlt_producer_init( &this->parent, this ) == 0 )
@@ -46,7 +47,9 @@ mlt_producer producer_qimage_init( char *filename )
                mlt_properties properties = MLT_PRODUCER_PROPERTIES( &this->parent );
        
                // Callback registration
+#ifdef USE_KDE
                init_qimage();
+#endif
                producer->get_frame = producer_get_frame;
                producer->close = ( mlt_destructor )producer_close;
 
@@ -56,12 +59,113 @@ mlt_producer producer_qimage_init( char *filename )
                mlt_properties_set_int( properties, "aspect_ratio", 1 );
                mlt_properties_set_int( properties, "progressive", 1 );
                
+               // Validate the resource
+               if ( filename )
+                       load_filenames( this, properties );
+               if ( this->count )
+               {
+                       mlt_frame frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
+                       if ( frame )
+                       {
+                               mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
+                               mlt_properties_set_data( properties, "producer_qimage", this, 0, NULL, NULL );
+                               mlt_frame_set_position( frame, mlt_producer_position( producer ) );
+                               mlt_properties_set_position( properties, "qimage_position", mlt_producer_position( producer ) );
+                               refresh_qimage( frame, 0, 0 );
+                               mlt_frame_close( frame );
+                       }
+               }
+               if ( this->current_width == 0 )
+               {
+                       producer_close( producer );
+                       producer = NULL;
+               }
                return producer;
        }
        free( this );
        return NULL;
 }
 
+static void load_filenames( producer_qimage this, mlt_properties producer_properties )
+{
+       char *filename = mlt_properties_get( producer_properties, "resource" );
+       this->filenames = mlt_properties_new( );
+
+       // Read xml string
+       if ( strstr( filename, "<svg" ) )
+       {
+               // Generate a temporary file for the svg
+               char fullname[ 1024 ] = "/tmp/mlt.XXXXXX";
+               int fd = mkstemp( fullname );
+
+               if ( fd > -1 )
+               {
+                       // Write the svg into the temp file
+                       ssize_t remaining_bytes;
+                       char *xml = filename;
+                       
+                       // Strip leading crap
+                       while ( xml[0] != '<' )
+                               xml++;
+                       
+                       remaining_bytes = strlen( xml );
+                       while ( remaining_bytes > 0 )
+                               remaining_bytes -= write( fd, xml + strlen( xml ) - remaining_bytes, remaining_bytes );
+                       close( fd );
+
+                       mlt_properties_set( this->filenames, "0", fullname );
+
+                       // Teehe - when the producer closes, delete the temp file and the space allo
+                       mlt_properties_set_data( producer_properties, "__temporary_file__", fullname, 0, ( mlt_destructor )unlink, NULL );
+               }
+       }
+       // Obtain filenames
+       else if ( strchr( filename, '%' ) != NULL )
+       {
+               // handle picture sequences
+               int i = mlt_properties_get_int( producer_properties, "begin" );
+               int gap = 0;
+               char full[1024];
+               int keyvalue = 0;
+               char key[ 50 ];
+
+               while ( gap < 100 )
+               {
+                       struct stat buf;
+                       snprintf( full, 1023, filename, i ++ );
+                       if ( stat( full, &buf ) == 0 )
+                       {
+                               sprintf( key, "%d", keyvalue ++ );
+                               mlt_properties_set( this->filenames, key, full );
+                               gap = 0;
+                       }
+                       else
+                       {
+                               gap ++;
+                       }
+               }
+       }
+       else if ( strstr( filename, "/.all." ) != NULL )
+       {
+               char wildcard[ 1024 ];
+               char *dir_name = strdup( filename );
+               char *extension = strrchr( dir_name, '.' );
+
+               *( strstr( dir_name, "/.all." ) + 1 ) = '\0';
+               sprintf( wildcard, "*%s", extension );
+
+               mlt_properties_dir_list( this->filenames, dir_name, wildcard, 1 );
+
+               free( dir_name );
+       }
+       else
+       {
+               mlt_properties_set( this->filenames, "0", filename );
+       }
+
+       this->count = mlt_properties_count( this->filenames );
+}
+
 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
@@ -161,87 +265,10 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
        mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( producer );
 
        if ( this->filenames == NULL && mlt_properties_get( producer_properties, "resource" ) != NULL )
-       {
-               char *filename = mlt_properties_get( producer_properties, "resource" );
-               this->filenames = mlt_properties_new( );
-
-               // Read xml string
-               if ( strstr( filename, "<svg" ) )
-               {
-                       // Generate a temporary file for the svg
-                       char fullname[ 1024 ] = "/tmp/mlt.XXXXXX";
-                       int fd = mkstemp( fullname );
-
-                       if ( fd > -1 )
-                       {
-                               // Write the svg into the temp file
-                               ssize_t remaining_bytes;
-                               char *xml = filename;
-                               
-                               // Strip leading crap
-                               while ( xml[0] != '<' )
-                                       xml++;
-                               
-                               remaining_bytes = strlen( xml );
-                               while ( remaining_bytes > 0 )
-                                       remaining_bytes -= write( fd, xml + strlen( xml ) - remaining_bytes, remaining_bytes );
-                               close( fd );
-
-                               mlt_properties_set( this->filenames, "0", fullname );
-
-                               // Teehe - when the producer closes, delete the temp file and the space allo
-                               mlt_properties_set_data( producer_properties, "__temporary_file__", fullname, 0, ( mlt_destructor )unlink, NULL );
-                       }
-               }
-               // Obtain filenames
-               else if ( strchr( filename, '%' ) != NULL )
-               {
-                       // handle picture sequences
-                       int i = mlt_properties_get_int( producer_properties, "begin" );
-                       int gap = 0;
-                       char full[1024];
-                       int keyvalue = 0;
-                       char key[ 50 ];
-
-                       while ( gap < 100 )
-                       {
-                               struct stat buf;
-                               snprintf( full, 1023, filename, i ++ );
-                               if ( stat( full, &buf ) == 0 )
-                               {
-                                       sprintf( key, "%d", keyvalue ++ );
-                                       mlt_properties_set( this->filenames, "0", full );
-                                       gap = 0;
-                               }
-                               else
-                               {
-                                       gap ++;
-                               }
-                       }
-               }
-               else if ( strstr( filename, "/.all." ) != NULL )
-               {
-                       char wildcard[ 1024 ];
-                       char *dir_name = strdup( filename );
-                       char *extension = strrchr( dir_name, '.' );
-
-                       *( strstr( dir_name, "/.all." ) + 1 ) = '\0';
-                       sprintf( wildcard, "*%s", extension );
-
-                       mlt_properties_dir_list( this->filenames, dir_name, wildcard, 1 );
-
-                       free( dir_name );
-               }
-               else
-               {
-                       mlt_properties_set( this->filenames, "0", filename );
-               }
-
-               this->count = mlt_properties_count( this->filenames );
-       }
+               load_filenames( this, producer_properties );
 
        // Generate a frame
-       *frame = mlt_frame_init( );
+       *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
 
        if ( *frame != NULL && this->count > 0 )
        {
@@ -281,6 +308,8 @@ static void producer_close( mlt_producer parent )
 {
        producer_qimage this = parent->child;
        parent->close = NULL;
+       mlt_pool_release( this->current_image );
+       mlt_pool_release( this->current_alpha );
        mlt_producer_close( parent );
        mlt_properties_close( this->filenames );
        free( this );