X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pango.c;h=84082dbef78916ae07377c2d45b48f5142b103e4;hb=1f6faabf5ef11e6321d186772d88fb6958cdd057;hp=7863979e47f5e45d9d567b490d74772ad2ff6007;hpb=05008d72aac63b4abca2bc51b9c6e73a722d5703;p=melted

diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c
index 7863979..84082db 100644
--- a/src/modules/gtk2/producer_pango.c
+++ b/src/modules/gtk2/producer_pango.c
@@ -41,6 +41,7 @@ struct producer_pango_s
 	char *markup;
 	char *text;
 	char *font;
+	int weight;
 };
 
 // special color type used by internal pango routines
@@ -54,7 +55,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int ind
 static void producer_close( mlt_producer parent );
 static void pango_draw_background( GdkPixbuf *pixbuf, rgba_color bg );
 static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const char *font,
-	rgba_color fg, rgba_color bg, int pad, int align );
+	rgba_color fg, rgba_color bg, int pad, int align, int weight, int size );
 
 /** Return nonzero if the two strings are equal, ignoring case, up to
     the first n characters.
@@ -87,6 +88,8 @@ static int alignment_parse( char* align )
 	return ret;
 }
 
+static PangoFT2FontMap *fontmap = NULL;
+
 mlt_producer producer_pango_init( const char *filename )
 {
 	producer_pango this = calloc( sizeof( struct producer_pango_s ), 1 );
@@ -94,6 +97,10 @@ mlt_producer producer_pango_init( const char *filename )
 	{
 		mlt_producer producer = &this->parent;
 
+		// THIS SHOULD BE MUTEXED...
+		if ( fontmap == NULL )
+			fontmap = (PangoFT2FontMap*) pango_ft2_font_map_new();
+
 		producer->get_frame = producer_get_frame;
 		producer->close = ( mlt_destructor )producer_close;
 
@@ -111,6 +118,7 @@ mlt_producer producer_pango_init( const char *filename )
 		mlt_properties_set( properties, "text", "" );
 		mlt_properties_set( properties, "font", "Sans 48" );
 		mlt_properties_set( properties, "encoding", "UTF-8" );
+		mlt_properties_set_int( properties, "weight", PANGO_WEIGHT_NORMAL );
 
 		if ( filename == NULL )
 		{
@@ -245,20 +253,22 @@ static int iconv_utf8( mlt_properties properties, char *prop_name, const char* e
 	iconv_t	cd = iconv_open( "UTF-8", encoding );
 	if ( cd != ( iconv_t )-1 )
 	{
-		char *inbuf_p = strdup( text );
+		char *inbuf_p = text;
 		size_t inbuf_n = strlen( text );
 		size_t outbuf_n = inbuf_n * 6;
 		char *outbuf = mlt_pool_alloc( outbuf_n );
 		char *outbuf_p = outbuf;
 		
-		if ( iconv( cd, &inbuf_p, &inbuf_n, &outbuf_p, &outbuf_n ) != -1 )
-		{
-			outbuf[ outbuf_n ] = 0;
+		memset( outbuf, 0, outbuf_n );
+
+		if ( text != NULL && strcmp( text, "" ) && iconv( cd, &inbuf_p, &inbuf_n, &outbuf_p, &outbuf_n ) != -1 )
 			mlt_properties_set( properties, prop_name, outbuf );
-			result = 0;
-		}
+		else
+			mlt_properties_set( properties, prop_name, "" );
+
 		mlt_pool_release( outbuf );
 		iconv_close( cd );
+		result = 0;
 	}
 	return result;
 }
@@ -289,6 +299,8 @@ static void refresh_image( mlt_frame frame, int width, int height )
 	char *text = mlt_properties_get( producer_props, "text" );
 	char *font = mlt_properties_get( producer_props, "font" );
 	char *encoding = mlt_properties_get( producer_props, "encoding" );
+	int weight = mlt_properties_get_int( producer_props, "weight" );
+	int size = mlt_properties_get_int( producer_props, "size" );
 	
 	// See if any properties changed
 	int property_changed = ( align != this->align );
@@ -298,6 +310,7 @@ static void refresh_image( mlt_frame frame, int width, int height )
 	property_changed = property_changed || ( markup && this->markup && strcmp( markup, this->markup ) );
 	property_changed = property_changed || ( text && this->text && strcmp( text, this->text ) );
 	property_changed = property_changed || ( font && this->font && strcmp( font, this->font ) );
+	property_changed = property_changed || ( weight != this->weight );
 
 	// Save the properties for next comparison
 	this->align = align;
@@ -307,6 +320,7 @@ static void refresh_image( mlt_frame frame, int width, int height )
 	set_string( &this->markup, markup, NULL );
 	set_string( &this->text, text, NULL );
 	set_string( &this->font, font, "Sans 48" );
+	this->weight = weight;
 
 	if ( property_changed )
 	{
@@ -334,7 +348,7 @@ static void refresh_image( mlt_frame frame, int width, int height )
 		}
 		
 		// Render the title
-		pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align );
+		pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align, weight, size );
 
 		if ( pixbuf != NULL )
 		{
@@ -436,7 +450,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 	{
 		// Clone our image
 		uint8_t *copy = mlt_pool_alloc( size );
-		if ( copy != NULL )
+		if ( copy != NULL && image != NULL )
 			memcpy( copy, image, size );
 
 		// We're going to pass the copy on
@@ -479,7 +493,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", 1 );
+	mlt_properties_set_double( properties, "aspect_ratio", 0 );
 
 	// Set alpha call back
 	( *frame )->get_alpha_mask = producer_get_alpha_mask;
@@ -530,9 +544,8 @@ static void pango_draw_background( GdkPixbuf *pixbuf, rgba_color bg )
 	}
 }
 
-static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const char *font, rgba_color fg, rgba_color bg, int pad, int align )
+static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const char *font, rgba_color fg, rgba_color bg, int pad, int align, int weight, int size )
 {
-	PangoFT2FontMap *fontmap = (PangoFT2FontMap*) pango_ft2_font_map_new();
 	PangoContext *context = pango_ft2_font_map_create_context( fontmap );
 	PangoLayout *layout = pango_layout_new( context );
 	int w, h, x;
@@ -543,10 +556,14 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const
 	uint8_t* dest = NULL;
 	uint8_t *d, *s, a;
 	int stride;
+	PangoFontDescription *desc = pango_font_description_from_string( font );
 
 	pango_ft2_font_map_set_resolution( fontmap, 72, 72 );
 	pango_layout_set_width( layout, -1 ); // set wrapping constraints
-	pango_layout_set_font_description( layout, pango_font_description_from_string( font ) );
+	pango_font_description_set_weight( desc, ( PangoWeight ) weight  );
+	if ( size != 0 )
+		pango_font_description_set_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  );
 	if ( markup != NULL && strcmp( markup, "" ) != 0 )
@@ -595,9 +612,9 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const
 		src += bitmap.pitch;
 	}
 	mlt_pool_release( bitmap.buffer );
+	pango_font_description_free( desc );
 	g_object_unref( layout );
 	g_object_unref( context );
-	g_object_unref( fontmap );
 
 	return pixbuf;
 }