X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pango.c;h=e4969aba59b287ab9c35692c85faf2e0f93ae986;hb=2f768c42c67ec9802222032f6d2bc63d7a3c6afb;hp=b7e8411cbdfd05f81276a51b6d98f1d7151868e6;hpb=0b288164cbeb9a3c98107d439d86844be13ba910;p=melted

diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c
index b7e8411..e4969ab 100644
--- a/src/modules/gtk2/producer_pango.c
+++ b/src/modules/gtk2/producer_pango.c
@@ -25,6 +25,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <pango/pangoft2.h>
 #include <freetype/freetype.h>
+#include <iconv.h>
 
 struct producer_pango_s
 {
@@ -55,6 +56,19 @@ 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 );
 
+/** Return nonzero if the two strings are equal, ignoring case, up to
+    the first n characters.
+*/
+int strncaseeq(const char *s1, const char *s2, size_t n)
+{
+	for ( ; n > 0; n--)
+	{
+		if (tolower(*s1++) != tolower(*s2++))
+			return 0;
+	}
+	return 1;
+}
+
 /** Parse the alignment property.
 */
 
@@ -81,7 +95,7 @@ mlt_producer producer_pango_init( const char *filename )
 		mlt_producer producer = &this->parent;
 
 		producer->get_frame = producer_get_frame;
-		producer->close = producer_close;
+		producer->close = ( mlt_destructor )producer_close;
 
 		// This is required to initialise gdk-pixbuf
 		g_type_init();
@@ -96,10 +110,10 @@ mlt_producer producer_pango_init( const char *filename )
 		mlt_properties_set_int( properties, "pad", 0 );
 		mlt_properties_set( properties, "text", "" );
 		mlt_properties_set( properties, "font", "Sans 48" );
+		mlt_properties_set( properties, "encoding", "UTF-8" );
 
 		if ( filename == NULL )
 		{
-			mlt_properties_set( properties, "resource", "pango" );
 			mlt_properties_set( properties, "markup", "" );
 		}
 		else if ( filename[ 0 ] == '+' || strstr( filename, "/+" ) )
@@ -149,7 +163,6 @@ mlt_producer producer_pango_init( const char *filename )
 			}
 			else
 			{
-				mlt_properties_set( properties, "resource", "pango" );
 				mlt_properties_set( properties, "markup", "" );
 			}
 		}
@@ -222,6 +235,34 @@ rgba_color parse_color( char *color )
 	return result;
 }
 
+/** Convert a string property to UTF-8
+*/
+static int iconv_utf8( mlt_properties properties, char *prop_name, const char* encoding )
+{
+	char *text = mlt_properties_get( properties, prop_name );
+	int result = -1;
+	
+	iconv_t	cd = iconv_open( "UTF-8", encoding );
+	if ( cd != ( iconv_t )-1 )
+	{
+		char *inbuf_p = strdup( 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;
+			mlt_properties_set( properties, prop_name, outbuf );
+			result = 0;
+		}
+		mlt_pool_release( outbuf );
+		iconv_close( cd );
+	}
+	return result;
+}
+
 static void refresh_image( mlt_frame frame, int width, int height )
 {
 	// Pixbuf 
@@ -247,7 +288,8 @@ static void refresh_image( mlt_frame frame, int width, int height )
 	char *markup = mlt_properties_get( producer_props, "markup" );
 	char *text = mlt_properties_get( producer_props, "text" );
 	char *font = mlt_properties_get( producer_props, "font" );
-
+	char *encoding = mlt_properties_get( producer_props, "encoding" );
+	
 	// See if any properties changed
 	int property_changed = ( align != this->align );
 	property_changed = property_changed || ( this->fgcolor == NULL || ( fg && strcmp( fg, this->fgcolor ) ) );
@@ -276,6 +318,21 @@ static void refresh_image( mlt_frame frame, int width, int height )
 		this->image = NULL;
 		this->alpha = NULL;
 
+		// Convert from specified encoding to UTF-8
+		if ( encoding != NULL && !strncaseeq( encoding, "utf-8", 5 ) && !strncaseeq( encoding, "utf8", 4 ) )
+		{
+			if ( markup != NULL && iconv_utf8( producer_props, "markup", encoding ) != -1 )
+			{
+				markup = mlt_properties_get( producer_props, "markup" );
+				set_string( &this->markup, markup, NULL );
+			}
+			if ( text != NULL && iconv_utf8( producer_props, "text", encoding ) != -1 )
+			{
+				text = mlt_properties_get( producer_props, "text" );
+				set_string( &this->text, text, NULL );
+			}
+		}
+		
 		// Render the title
 		pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align );
 
@@ -421,7 +478,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;
@@ -537,4 +594,3 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const
 
 	return pixbuf;
 }
-