X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Ffactory.c;h=fe2d65f2e487ecd63770b44c9200992af3128626;hb=b92d5da5f5adff2046024e06e3cbe9fa9d51c5f4;hp=5ccb204f4518167d83f104860a46e4ea54f44f4c;hpb=6fbad87cfc97a367c4e47216b83c9e433253aa9e;p=melted

diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
index 5ccb204..fe2d65f 100644
--- a/src/modules/avformat/factory.c
+++ b/src/modules/avformat/factory.c
@@ -21,12 +21,13 @@
 #include <string.h>
 #include <pthread.h>
 
-#include <framework/mlt_factory.h>
-#include "producer_avformat.h"
-#include "consumer_avformat.h"
-#include "filter_avcolour_space.h"
-#include "filter_avdeinterlace.h"
-#include "filter_avresample.h"
+#include <framework/mlt.h>
+
+extern mlt_consumer consumer_avformat_init( mlt_profile profile, char *file );
+extern mlt_filter filter_avcolour_space_init( void *arg );
+extern mlt_filter filter_avdeinterlace_init( void *arg );
+extern mlt_filter filter_avresample_init( char *arg );
+extern mlt_producer producer_avformat_init( mlt_profile profile, char *file );
 
 // ffmpeg Header files
 #include <avformat.h>
@@ -91,17 +92,16 @@ static void avformat_init( )
 	}
 }
 
-void *mlt_create_producer( char *id, void *arg )
+static void *create_service( mlt_profile profile, mlt_service_type type, const char *id, void *arg )
 {
 	avformat_init( );
 	if ( !strcmp( id, "avformat" ) )
-		return producer_avformat_init( arg );
-	return NULL;
-}
-
-void *mlt_create_filter( char *id, void *arg )
-{
-	avformat_init( );
+	{
+		if ( type == producer_type )
+			return producer_avformat_init( profile, arg );
+		else if ( type == consumer_type )
+			return consumer_avformat_init( profile, arg );		
+	}
 	if ( !strcmp( id, "avcolour_space" ) )
 		return filter_avcolour_space_init( arg );
 #ifdef USE_MMX
@@ -113,16 +113,12 @@ void *mlt_create_filter( char *id, void *arg )
 	return NULL;
 }
 
-void *mlt_create_transition( char *id, void *arg )
+MLT_REPOSITORY
 {
-	return NULL;
-}
-
-void *mlt_create_consumer( char *id, void *arg )
-{
-	avformat_init( );
-	if ( !strcmp( id, "avformat" ) )
-		return consumer_avformat_init( arg );
-	return NULL;
+	MLT_REGISTER( consumer_type, "avformat", create_service );
+	MLT_REGISTER( producer_type, "avformat", create_service );
+	MLT_REGISTER( filter_type, "avcolour_space", create_service );
+	MLT_REGISTER( filter_type, "avcolor_space", create_service );
+	MLT_REGISTER( filter_type, "avdeinterlace", create_service );
+	MLT_REGISTER( filter_type, "avresample", create_service );
 }
-