X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=d6eeb4220e1c004c73b25a56fb2b1d372cf25cd3;hb=845797debbd5cfdc3dc515595afa572727842bf2;hp=5e341fee528e9718db4b3e392b5041d26240da71;hpb=d7ae73d25cf5a38a3a8153ae52409fcbef16bb22;p=melted

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index 5e341fe..d6eeb42 100644
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -274,8 +274,39 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 		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
-		if ( strchr( filename, '%' ) != NULL )
+		else if ( strchr( filename, '%' ) != NULL )
 		{
 			// handle picture sequences
 			int i = 0;
@@ -327,29 +358,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 			free( de );
 			free( dir_name );
 		}
-		else 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 = strlen( filename );
-				while ( remaining_bytes > 0 )
-					remaining_bytes -= write( fd, filename + strlen( filename ) - 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 );
-			}
-		}
 		else
 		{
 			this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
@@ -380,7 +388,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;
@@ -401,11 +409,8 @@ static void producer_close( mlt_producer parent )
 	mlt_pool_release( this->image );
 	parent->close = NULL;
 	mlt_producer_close( parent );
-	while ( *this->filenames )
-	{
-		free( *this->filenames );
-		this->filenames++;
-	}
+	while ( this->count -- )
+		free( this->filenames[ this->count ] );
+	free( this->filenames );
 	free( this );
 }
-