X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Finigo%2Fproducer_inigo.c;h=893c01e1fc5aaaed2c1fb602b4cbadd2791b369e;hb=42bd0aedb6d3d65bedb98479adcdbaeb326dfee9;hp=ed20ea3b1a2e3d340e0a01ec21464110bde5aa45;hpb=16c5c516008b9debec7765e34f4756f8063dee7e;p=melted

diff --git a/src/modules/inigo/producer_inigo.c b/src/modules/inigo/producer_inigo.c
index ed20ea3..893c01e 100644
--- a/src/modules/inigo/producer_inigo.c
+++ b/src/modules/inigo/producer_inigo.c
@@ -26,7 +26,7 @@
 
 #include <framework/mlt.h>
 
-static mlt_producer parse_inigo( char *file )
+mlt_producer producer_inigo_file_init( char *file )
 {
 	FILE *input = fopen( file, "r" );
 	char **args = calloc( sizeof( char * ), 1000 );
@@ -58,13 +58,22 @@ static mlt_producer parse_inigo( char *file )
 	return result;
 }
 
-static mlt_producer create_producer( char *file )
+static void track_service( mlt_field field, void *service, mlt_destructor destructor )
+{
+	mlt_properties properties = mlt_field_properties( field );
+	int registered = mlt_properties_get_int( properties, "registered" );
+	char *key = mlt_properties_get( properties, "registered" );
+	mlt_properties_set_data( properties, key, service, 0, destructor, NULL );
+	mlt_properties_set_int( properties, "registered", ++ registered );
+}
+
+static mlt_producer create_producer( mlt_field field, char *file )
 {
 	mlt_producer result = NULL;
 
 	// 1st Line preferences
 	if ( strstr( file, ".inigo" ) )
-		result = parse_inigo( file );
+		result = mlt_factory_producer( "inigo_file", file );
 	else if ( strstr( file, ".mpg" ) )
 		result = mlt_factory_producer( "mcmpeg", file );
 	else if ( strstr( file, ".mpeg" ) )
@@ -85,6 +94,8 @@ static mlt_producer create_producer( char *file )
 		result = mlt_factory_producer( "pango", file );
 	else if ( strstr( file, ".westley" ) )
 		result = mlt_factory_producer( "westley", file );
+	else if ( strstr( file, ".ogg" ) )
+		result = mlt_factory_producer( "vorbis", file );
 
 	// 2nd Line fallbacks
 	if ( result == NULL && strstr( file, ".dv" ) )
@@ -96,16 +107,14 @@ static mlt_producer create_producer( char *file )
 	if ( result == NULL )
 		result = mlt_factory_producer( "avformat", file );
 
-	return result;
-}
+	// 4th line fallbacks 
+	if ( result == NULL )
+		result = mlt_factory_producer( "ffmpeg", file );
 
-static void track_service( mlt_field field, void *service, mlt_destructor destructor )
-{
-	mlt_properties properties = mlt_field_properties( field );
-	int registered = mlt_properties_get_int( properties, "registered" );
-	char *key = mlt_properties_get( properties, "registered" );
-	mlt_properties_set_data( properties, key, service, 0, destructor, NULL );
-	mlt_properties_set_int( properties, "registered", ++ registered );
+	if ( result != NULL )
+		track_service( field, result, ( mlt_destructor )mlt_producer_close );
+
+	return result;
 }
 
 static mlt_filter create_filter( mlt_field field, char *id, int track )
@@ -195,6 +204,7 @@ mlt_producer producer_inigo_init( char **argv )
 				mlt_playlist_append( playlist, producer );
 			producer = NULL;
 			mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), track ++ );
+			track_service( field, playlist, ( mlt_destructor )mlt_playlist_close );
 			playlist = mlt_playlist_init( );
 		}
 		else if ( strstr( argv[ i ], "=" ) )
@@ -205,7 +215,7 @@ mlt_producer producer_inigo_init( char **argv )
 		{
 			if ( producer != NULL )
 				mlt_playlist_append( playlist, producer );
-			producer = create_producer( argv[ i ] );
+			producer = create_producer( field, argv[ i ] );
 			if ( producer != NULL )
 			{
 				properties = mlt_producer_properties( producer );
@@ -226,23 +236,23 @@ mlt_producer producer_inigo_init( char **argv )
 		}
 	}
 
-	// Connect producer to playlist
+	// Connect last producer to playlist
 	if ( producer != NULL )
 		mlt_playlist_append( playlist, producer );
 
-	// We must have a producer at this point
+	// Track the last playlist too
+	track_service( field, playlist, ( mlt_destructor )mlt_playlist_close );
+
+	// We must have a playlist to connect
 	if ( mlt_playlist_count( playlist ) > 0 )
-	{
-		// Connect multitrack to producer
 		mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), track );
-	}
 
 	mlt_tractor tractor = mlt_field_tractor( field );
 	mlt_producer prod = mlt_tractor_producer( tractor );
 	mlt_properties props = mlt_tractor_properties( tractor );
-	mlt_properties_set_data( props, "multitrack", multitrack, 0, NULL, NULL );
-	mlt_properties_set_data( props, "field", field, 0, NULL, NULL );
-	mlt_properties_set_data( props, "group", group, 0, NULL, NULL );
+	mlt_properties_set_data( props, "multitrack", multitrack, 0, ( mlt_destructor )mlt_multitrack_close, NULL );
+	mlt_properties_set_data( props, "field", field, 0, ( mlt_destructor )mlt_field_close, NULL );
+	mlt_properties_set_data( props, "group", group, 0, ( mlt_destructor )mlt_properties_close, NULL );
 	mlt_properties_set_position( props, "length", mlt_producer_get_out( mlt_multitrack_producer( multitrack ) ) + 1 );
 	mlt_producer_set_in_and_out( prod, 0, mlt_producer_get_out( mlt_multitrack_producer( multitrack ) ) );
 	mlt_properties_set_double( props, "fps", mlt_producer_get_fps( mlt_multitrack_producer( multitrack ) ) );