X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Ffactory.c;h=5a093dd50e20696d5ee81f3b486ec2de0bc68db6;hb=573fbdb1b3725394755ef2c0857c200d18974ee1;hp=38e1692cc49bc6f079234edabc4f0f47e8c7cada;hpb=9d64164b417c1d76e6fe06bbaddfa787ec0e8ee9;p=melted

diff --git a/src/modules/gtk2/factory.c b/src/modules/gtk2/factory.c
index 38e1692..5a093dd 100644
--- a/src/modules/gtk2/factory.c
+++ b/src/modules/gtk2/factory.c
@@ -18,22 +18,59 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include <string.h>
 
+#ifdef USE_PIXBUF
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include "producer_pixbuf.h"
+#include "filter_rescale.h"
+#endif
+
+#ifdef USE_GTK2
+#include "consumer_gtk2.h"
+#endif
+
+#ifdef USE_PANGO
 #include "producer_pango.h"
+#endif
+
+static void initialise( )
+{
+	static int init = 0;
+	if ( init == 0 )
+	{
+		init = 1;
+		g_type_init( );
+	}
+}
 
 void *mlt_create_producer( char *id, void *arg )
 {
+	initialise( );
+
+#ifdef USE_PIXBUF
 	if ( !strcmp( id, "pixbuf" ) )
 		return producer_pixbuf_init( arg );
-	else if ( !strcmp( id, "pango" ) )
+#endif
+
+#ifdef USE_PANGO
+	if ( !strcmp( id, "pango" ) )
 		return producer_pango_init( arg );
+#endif
+
 	return NULL;
 }
 
 void *mlt_create_filter( char *id, void *arg )
 {
+	initialise( );
+
+#ifdef USE_PIXBUF
+	if ( !strcmp( id, "gtkrescale" ) )
+		return filter_rescale_init( arg );
+#endif
+
 	return NULL;
 }
 
@@ -44,6 +81,13 @@ void *mlt_create_transition( char *id, void *arg )
 
 void *mlt_create_consumer( char *id, void *arg )
 {
+	initialise( );
+
+#ifdef USE_GTK2
+	if ( !strcmp( id, "gtk2_preview" ) )
+		return consumer_gtk2_preview_init( arg );
+#endif
+
 	return NULL;
 }