X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Ffactory.c;h=5a093dd50e20696d5ee81f3b486ec2de0bc68db6;hb=3374a9bd3da60d13e5b361a809bcef172aa23920;hp=d846e64160e02c39884ab9ec50a1dfa3715f448d;hpb=263e253a65f403b90eecf0b46b692e326e970b29;p=melted

diff --git a/src/modules/gtk2/factory.c b/src/modules/gtk2/factory.c
index d846e64..5a093dd 100644
--- a/src/modules/gtk2/factory.c
+++ b/src/modules/gtk2/factory.c
@@ -18,25 +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 "producer_pango.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;
 }
 
@@ -47,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;
 }