X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Ffactory.c;h=34d62e263b4c030bc93852cfe526c990006add50;hb=4112170ce8053261b9c67f58df87c2a3573b6602;hp=be50416909f8d5cf1b05061a3a497740bb7ef8b5;hpb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;p=melted

diff --git a/src/modules/gtk2/factory.c b/src/modules/gtk2/factory.c
index be50416..34d62e2 100644
--- a/src/modules/gtk2/factory.c
+++ b/src/modules/gtk2/factory.c
@@ -20,19 +20,20 @@
 
 #include "config.h"
 #include <string.h>
+#include <framework/mlt.h>
+#include <gdk/gdk.h>
 
 #ifdef USE_PIXBUF
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "producer_pixbuf.h"
-#include "filter_rescale.h"
+extern mlt_producer producer_pixbuf_init( char *filename );
+extern mlt_filter filter_rescale_init( mlt_profile profile, char *arg );
 #endif
 
 #ifdef USE_GTK2
-#include "consumer_gtk2.h"
+extern mlt_consumer consumer_gtk2_preview_init( mlt_profile profile, void *widget );
 #endif
 
 #ifdef USE_PANGO
-#include "producer_pango.h"
+extern mlt_producer producer_pango_init( const char *filename );
 #endif
 
 static void initialise( )
@@ -45,7 +46,7 @@ static void initialise( )
 	}
 }
 
-void *mlt_create_producer( char *id, void *arg )
+void *create_service( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
 	initialise( );
 
@@ -59,35 +60,23 @@ void *mlt_create_producer( char *id, void *arg )
 		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 );
+		return filter_rescale_init( profile, arg );
 #endif
 
-	return NULL;
-}
-
-void *mlt_create_transition( char *id, void *arg )
-{
-	return NULL;
-}
-
-void *mlt_create_consumer( char *id, void *arg )
-{
-	initialise( );
-
 #ifdef USE_GTK2
 	if ( !strcmp( id, "gtk2_preview" ) )
-		return consumer_gtk2_preview_init( arg );
+		return consumer_gtk2_preview_init( profile, arg );
 #endif
 
 	return NULL;
 }
 
+MLT_REPOSITORY
+{
+	MLT_REGISTER( consumer_type, "gtk2_preview", create_service );
+	MLT_REGISTER( filter_type, "gtkrescale", create_service );
+	MLT_REGISTER( producer_type, "pango", create_service );
+	MLT_REGISTER( producer_type, "pixbuf", create_service );
+}