X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=5007ad7bdbe0a885c0dfab184cb61ac8bc1a75a9;hb=34caefec7aa0334f38a649838cf3ab9db7388b27;hp=cd32429fe5f386684e6228d8d183ce0b1b1c2fbf;hpb=f0a20dae7fddfce0b3992bb6942145a3640315ba;p=melted

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index cd32429..5007ad7 100644
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -62,7 +62,7 @@ static int filter_files( const struct dirent *de )
 mlt_producer producer_pixbuf_init( char *filename )
 {
 	producer_pixbuf this = calloc( sizeof( struct producer_pixbuf_s ), 1 );
-	if ( filename != NULL && this != NULL && mlt_producer_init( &this->parent, this ) == 0 )
+	if ( this != NULL && mlt_producer_init( &this->parent, this ) == 0 )
 	{
 		mlt_producer producer = &this->parent;
 
@@ -77,66 +77,6 @@ mlt_producer producer_pixbuf_init( char *filename )
 		mlt_properties_set( properties, "resource", filename );
 		mlt_properties_set_int( properties, "ttl", 25 );
 		
-		// Obtain filenames
-		if ( strchr( filename, '%' ) != NULL )
-		{
-			// handle picture sequences
-			int i = 0;
-			int gap = 0;
-			char full[1024];
-
-			while ( gap < 100 )
-			{
-				struct stat buf;
-				snprintf( full, 1023, filename, i ++ );
-				if ( stat( full, &buf ) == 0 )
-				{
-					this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
-					this->filenames[ this->count ++ ] = strdup( full );
-					gap = 0;
-				}
-				else
-				{
-					gap ++;
-				}
-			} 
-			mlt_properties_set_position( properties, "out", this->count * 250 );
-		}
-		else if ( strstr( filename, "/.all." ) != NULL )
-		{
-			char *dir_name = strdup( filename );
-			char *extension = strrchr( filename, '.' );
-			*( strstr( dir_name, "/.all." ) + 1 ) = '\0';
-			char fullname[ 1024 ];
-			strcpy( fullname, dir_name );
-			struct dirent **de = NULL;
-			int n = scandir( fullname, &de, filter_files, alphasort );
-			int i;
-			struct stat info;
-
-			for (i = 0; i < n; i++ )
-			{
-				snprintf( fullname, 1023, "%s%s", dir_name, de[i]->d_name );
-
-				if ( lstat( fullname, &info ) == 0 && 
-				 	( S_ISREG( info.st_mode ) || ( strstr( fullname, extension ) && info.st_mode | S_IXUSR ) ) )
-				{
-					this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
-					this->filenames[ this->count ++ ] = strdup( fullname );
-				}
-				free( de[ i ] );
-			}
-
-			free( de );
-			free( dir_name );
-		}
-		else
-		{
-			this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
-			this->filenames[ this->count ++ ] = strdup( filename );
-			mlt_properties_set_position( properties, "out", 250 );
-		}
-
 		// Initialise gobject types
 		g_type_init();
 
@@ -279,10 +219,6 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 	// Refresh the image
 	refresh_image( frame, *width, *height );
 
-	// Determine format
-	//mlt_producer this = mlt_properties_get_data( properties, "producer_pixbuf", NULL );
-	//*format = ( mlt_properties_get_int( mlt_producer_properties( this ), "bpp" ) == 4 ) ? mlt_image_rgb24a : mlt_image_rgb24;
-
 	// May need to know the size of the image to clone it
 	int size = 0;
 
@@ -329,6 +265,103 @@ 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 )
+	{
+		mlt_properties properties = mlt_producer_properties( producer );
+		char *filename = mlt_properties_get( properties, "resource" );
+		
+		// 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 );
+
+				this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
+				this->filenames[ this->count ++ ] = strdup( fullname );
+
+				mlt_properties_set_position( properties, "out", 250 );
+
+				// Teehe - when the producer closes, delete the temp file and the space allo
+				mlt_properties_set_data( properties, "__temporary_file__", this->filenames[ this->count - 1 ], 0, ( mlt_destructor )unlink, NULL );
+			}
+		}
+		// Obtain filenames
+		else if ( strchr( filename, '%' ) != NULL )
+		{
+			// handle picture sequences
+			int i = 0;
+			int gap = 0;
+			char full[1024];
+
+			while ( gap < 100 )
+			{
+				struct stat buf;
+				snprintf( full, 1023, filename, i ++ );
+				if ( stat( full, &buf ) == 0 )
+				{
+					this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
+					this->filenames[ this->count ++ ] = strdup( full );
+					gap = 0;
+				}
+				else
+				{
+					gap ++;
+				}
+			}
+			mlt_properties_set_position( properties, "out", this->count * 250 );
+		}
+		else if ( strstr( filename, "/.all." ) != NULL )
+		{
+			char *dir_name = strdup( filename );
+			char *extension = strrchr( filename, '.' );
+			*( strstr( dir_name, "/.all." ) + 1 ) = '\0';
+			char fullname[ 1024 ];
+			strcpy( fullname, dir_name );
+			struct dirent **de = NULL;
+			int n = scandir( fullname, &de, filter_files, alphasort );
+			int i;
+			struct stat info;
+
+			for (i = 0; i < n; i++ )
+			{
+				snprintf( fullname, 1023, "%s%s", dir_name, de[i]->d_name );
+
+				if ( lstat( fullname, &info ) == 0 &&
+				 	( S_ISREG( info.st_mode ) || ( strstr( fullname, extension ) && info.st_mode | S_IXUSR ) ) )
+				{
+					this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
+					this->filenames[ this->count ++ ] = strdup( fullname );
+				}
+				free( de[ i ] );
+			}
+
+			free( de );
+			free( dir_name );
+		}
+		else
+		{
+			this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
+			this->filenames[ this->count ++ ] = strdup( filename );
+			mlt_properties_set_position( properties, "out", 250 );
+		}
+	}
+
 	// Generate a frame
 	*frame = mlt_frame_init( );
 
@@ -351,7 +384,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 
 		// Set producer-specific frame properties
 		mlt_properties_set_int( properties, "progressive", 1 );
-		mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( properties, "real_width" )/mlt_properties_get_double( properties, "real_height" ) );
+		mlt_properties_set_double( properties, "aspect_ratio", 1 );
 
 		// Set alpha call back
 		( *frame )->get_alpha_mask = producer_get_alpha_mask;
@@ -372,6 +405,8 @@ static void producer_close( mlt_producer parent )
 	mlt_pool_release( this->image );
 	parent->close = NULL;
 	mlt_producer_close( parent );
+	while ( this->count -- )
+		free( this->filenames[ this->count ] );
+	free( this->filenames );
 	free( this );
 }
-