[Mlt-devel] mlt/src/modules/gtk2 producer_pixbuf.c,1.36,1.37

[Charles Y. <lil...@us...>]

Update of /cvsroot/mlt/mlt/src/modules/gtk2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1709/src/modules/gtk2

Modified Files:
	producer_pixbuf.c 
Log Message:

src/framework/mlt_frame.c 
+ Correction for aspect ratio of synthesized test card

src/framework/mlt_playlist.c 
+ Special case for handling fx cuts

src/modules/fezzik.dict 
+ Convenience jfx and jef extensions for jahshaka

src/modules/core/transition_composite.c 
+ Ensure that scaling and correct image extraction is handled

src/modules/core/transition_luma.c 
+ Ensure that scaling and correct image extraction is handled

src/modules/gtk2/producer_pixbuf.c 
+ Allow user overrides for progressive and aspect_ration

src/modules/westley/producer_westley.c 
+ Special case for fx cuts


Index: producer_pixbuf.c
===================================================================
RCS file: /cvsroot/mlt/mlt/src/modules/gtk2/producer_pixbuf.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- producer_pixbuf.c	21 Jun 2005 20:59:39 -0000	1.36
+++ producer_pixbuf.c	5 Jul 2005 09:31:08 -0000	1.37
@@ -79,6 +79,8 @@
 		// Set the default properties
 		mlt_properties_set( properties, "resource", filename );
 		mlt_properties_set_int( properties, "ttl", 25 );
+		mlt_properties_set_int( properties, "aspect_ratio", 1 );
+		mlt_properties_set_int( properties, "progressive", 1 );
 		
 		return producer;
 	}
@@ -282,10 +284,12 @@
 	// 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 )
+	// Fetch the producers properties
+	mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( producer );
+
+	if ( this->count == 0 && mlt_properties_get( producer_properties, "resource" ) != NULL )
 	{
-		mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
-		char *filename = mlt_properties_get( properties, "resource" );
+		char *filename = mlt_properties_get( producer_properties, "resource" );
 		
 		// Read xml string
 		if ( strstr( filename, "<svg" ) )
@@ -313,14 +317,14 @@
 				this->filenames[ this->count ++ ] = strdup( fullname );
 
 				// 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 );
+				mlt_properties_set_data( producer_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 = mlt_properties_get_int( properties, "begin" );
+			int i = mlt_properties_get_int( producer_properties, "begin" );
 			int gap = 0;
 			char full[1024];
 
@@ -396,8 +400,8 @@
 		refresh_image( *frame, 0, 0 );
 
 		// Set producer-specific frame properties
-		mlt_properties_set_int( properties, "progressive", 1 );
-		mlt_properties_set_double( properties, "aspect_ratio", 1 );
+		mlt_properties_set_int( properties, "progressive", mlt_properties_get_int( producer_properties, "progressive" ) );
+		mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( producer_properties, "aspect_ratio" ) );
 
 		// Set alpha call back
 		( *frame )->get_alpha_mask = producer_get_alpha_mask;