X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pango.c;h=3398e79a285cce6f19fca18d76e6ad10310881ba;hb=f4963a6aa07644399b273b5d2b1f9299c9047414;hp=5aebe96d9fa788fda712912b9169752a137c322e;hpb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;p=melted

diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c
index 5aebe96..3398e79 100644
--- a/src/modules/gtk2/producer_pango.c
+++ b/src/modules/gtk2/producer_pango.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "producer_pango.h"
+#include <framework/mlt_producer.h>
 #include <framework/mlt_frame.h>
 #include <framework/mlt_geometry.h>
 #include <stdlib.h>
@@ -28,6 +28,16 @@
 #include <freetype/freetype.h>
 #include <iconv.h>
 #include <pthread.h>
+#include <ctype.h>
+
+typedef struct producer_pango_s *producer_pango;
+
+typedef enum
+{
+	pango_align_left = 0,
+	pango_align_center,
+	pango_align_right
+} pango_align;
 
 static pthread_mutex_t pango_mutex = PTHREAD_MUTEX_INITIALIZER;
 
@@ -136,7 +146,7 @@ mlt_producer producer_pango_init( const char *filename )
 			( *strrchr( markup, '.' ) ) = '\0';
 			while ( strchr( markup, '~' ) )
 				( *strchr( markup, '~' ) ) = '\n';
-			mlt_properties_set( properties, "resource", ( char * )filename );
+			mlt_properties_set( properties, "resource", filename );
 			mlt_properties_set( properties, "markup", markup );
 			free( copy );
 		}
@@ -146,7 +156,7 @@ mlt_producer producer_pango_init( const char *filename )
 			mlt_properties contents = mlt_properties_load( filename );
 			mlt_geometry key_frames = mlt_geometry_init( );
 			struct mlt_geometry_item_s item;
-			mlt_properties_set( properties, "resource", ( char * )filename );
+			mlt_properties_set( properties, "resource", filename );
 			mlt_properties_set_data( properties, "contents", contents, 0, ( mlt_destructor )mlt_properties_close, NULL );
 			mlt_properties_set_data( properties, "key_frames", key_frames, 0, ( mlt_destructor )mlt_geometry_close, NULL );
 
@@ -192,8 +202,8 @@ mlt_producer producer_pango_init( const char *filename )
 				if ( markup[ strlen( markup ) - 1 ] == '\n' ) 
 					markup[ strlen( markup ) - 1 ] = '\0';
 
-				mlt_properties_set( properties, "resource", ( char * ) filename );
-				mlt_properties_set( properties, "markup", ( char * ) ( markup == NULL ? "" : markup ) );
+				mlt_properties_set( properties, "resource", filename );
+				mlt_properties_set( properties, "markup", ( markup == NULL ? "" : markup ) );
 				free( markup );
 			}
 			else
@@ -208,7 +218,7 @@ mlt_producer producer_pango_init( const char *filename )
 	return NULL;
 }
 
-static void set_string( char **string, char *value, char *fallback )
+static void set_string( char **string, const char *value, const char *fallback )
 {
 	if ( value != NULL )
 	{
@@ -272,7 +282,7 @@ rgba_color parse_color( char *color )
 
 /** Convert a string property to UTF-8
 */
-static int iconv_utf8( mlt_properties properties, char *prop_name, const char* encoding )
+static int iconv_utf8( mlt_properties properties, const char *prop_name, const char* encoding )
 {
 	char *text = mlt_properties_get( properties, prop_name );
 	int result = -1;
@@ -432,8 +442,8 @@ static void refresh_image( mlt_frame frame, int width, int height )
 		else if ( strcmp( interps, "hyper" ) == 0 )
 			interp = GDK_INTERP_HYPER;
 
-//		fprintf( stderr, "SCALING PANGO from %dx%d to %dx%d was %dx%d\n", gdk_pixbuf_get_width( pixbuf ), gdk_pixbuf_get_height( pixbuf ), width, height, this->width, this->height );
-			
+// fprintf(stderr,"%s: scaling from %dx%d to %dx%d\n", __FILE__, this->width, this->height, width, height);
+
 		// Note - the original pixbuf is already safe and ready for destruction
 		pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, interp );
 
@@ -543,7 +553,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 	producer_pango this = producer->child;
 
 	// Generate a frame
-	*frame = mlt_frame_init( );
+	*frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
 
 	// Obtain properties of frame and producer
 	mlt_properties properties = MLT_FRAME_PROPERTIES( *frame );
@@ -628,7 +638,7 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const
 	pango_layout_set_width( layout, -1 ); // set wrapping constraints
 	pango_font_description_set_weight( desc, ( PangoWeight ) weight  );
 	if ( size != 0 )
-		pango_font_description_set_size( desc, PANGO_SCALE * size );
+		pango_font_description_set_absolute_size( desc, PANGO_SCALE * size );
 	pango_layout_set_font_description( layout, desc );
 //	pango_layout_set_spacing( layout, space );
 	pango_layout_set_alignment( layout, ( PangoAlignment ) align  );
@@ -652,6 +662,19 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const
 	}
 	pango_layout_get_pixel_size( layout, &w, &h );
 
+	// Interpret size property as an absolute pixel height and compensate for
+	// freetype's "interpretation" of our absolute size request. This gives
+	// precise control over compositing and better quality by reducing scaling
+	// artifacts with composite geometries that constrain the dimensions.
+	// If you do not want this, then put the size in the font property or in
+	// the pango markup.
+	if ( size != 0 )
+	{
+		pango_font_description_set_absolute_size( desc, PANGO_SCALE * size * size/h );
+		pango_layout_set_font_description( layout, desc );
+		pango_layout_get_pixel_size( layout, &w, &h );
+	}
+
 	pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE /* has alpha */, 8, w + 2 * pad, h + 2 * pad );
 	pango_draw_background( pixbuf, bg );