X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Ffactory.c;h=34d62e263b4c030bc93852cfe526c990006add50;hb=1971a6aa9301e7c841b7dda42eab6fff7d69763c;hp=5a093dd50e20696d5ee81f3b486ec2de0bc68db6;hpb=b21ea9a5416460213574bd00ce8f61be3d1b63c5;p=melted

diff --git a/src/modules/gtk2/factory.c b/src/modules/gtk2/factory.c
index 5a093dd..34d62e2 100644
--- a/src/modules/gtk2/factory.c
+++ b/src/modules/gtk2/factory.c
@@ -3,36 +3,37 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #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 );
+}