X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Finigo%2Fproducer_inigo.c;h=35e84ad1364553c972873f447180000d15d604aa;hb=de09bd0b00071c23666dc21bb15c619c0c9095d6;hp=313e8d59782e3e5ac4f89475d04fbde61908e22f;hpb=e119b618924284bb2bcc7c2199ab06066ed76c8e;p=melted

diff --git a/src/modules/inigo/producer_inigo.c b/src/modules/inigo/producer_inigo.c
index 313e8d5..35e84ad 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 );
@@ -48,9 +48,7 @@ static mlt_producer parse_inigo( char *file )
 	if ( result != NULL )
 	{
 		mlt_properties properties = mlt_producer_properties( result );
-		fprintf( stderr, "resource = %s\n", mlt_properties_get( properties, "resource" ) );
 		mlt_properties_set( properties, "resource", file );
-		fprintf( stderr, "resource = %s\n", mlt_properties_get( properties, "resource" ) );
 	}
 
 	while( count -- )
@@ -60,53 +58,6 @@ static mlt_producer parse_inigo( char *file )
 	return result;
 }
 
-static mlt_producer create_producer( char *file )
-{
-	mlt_producer result = NULL;
-
-	// 1st Line preferences
-	if ( strstr( file, ".inigo" ) )
-		result = parse_inigo( file );
-	else if ( strstr( file, ".mpg" ) )
-		result = mlt_factory_producer( "mcmpeg", file );
-	else if ( strstr( file, ".mpeg" ) )
-		result = mlt_factory_producer( "mcmpeg", file );
-	else if ( strstr( file, ".dv" ) )
-		result = mlt_factory_producer( "mcdv", file );
-	else if ( strstr( file, ".dif" ) )
-		result = mlt_factory_producer( "mcdv", file );
-	else if ( strstr( file, ".jpg" ) )
-		result = mlt_factory_producer( "pixbuf", file );
-	else if ( strstr( file, ".JPG" ) )
-		result = mlt_factory_producer( "pixbuf", file );
-	else if ( strstr( file, ".jpeg" ) )
-		result = mlt_factory_producer( "pixbuf", file );
-	else if ( strstr( file, ".png" ) )
-		result = mlt_factory_producer( "pixbuf", file );
-	else if ( strstr( file, ".txt" ) )
-		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" ) )
-		result = mlt_factory_producer( "libdv", file );
-	else if ( result == NULL && strstr( file, ".dif" ) )
-		result = mlt_factory_producer( "libdv", file );
-
-	// 3rd line fallbacks 
-	if ( result == NULL )
-		result = mlt_factory_producer( "avformat", file );
-
-	// 4th line fallbacks 
-	if ( result == NULL )
-		result = mlt_factory_producer( "ffmpeg", file );
-
-	return result;
-}
-
 static void track_service( mlt_field field, void *service, mlt_destructor destructor )
 {
 	mlt_properties properties = mlt_field_properties( field );
@@ -116,6 +67,16 @@ static void track_service( mlt_field field, void *service, mlt_destructor destru
 	mlt_properties_set_int( properties, "registered", ++ registered );
 }
 
+static mlt_producer create_producer( mlt_field field, char *file )
+{
+	mlt_producer result = mlt_factory_producer( "fezzik", file );
+
+	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 )
 {
 	char *arg = strchr( id, ':' );
@@ -183,7 +144,7 @@ mlt_producer producer_inigo_init( char **argv )
 		}
 		else if ( !strcmp( argv[ i ], "-transition" ) )
 		{
-			mlt_transition transition = create_transition( field, argv[ ++ i ], track );
+			mlt_transition transition = create_transition( field, argv[ ++ i ], track - 1 );
 			if ( transition != NULL )
 			{
 				properties = mlt_transition_properties( transition );
@@ -197,15 +158,29 @@ mlt_producer producer_inigo_init( char **argv )
 			producer = NULL;
 			mlt_playlist_blank( playlist, atof( argv[ ++ i ] ) );
 		}
-		else if ( !strcmp( argv[ i ], "-track" ) )
+		else if ( !strcmp( argv[ i ], "-track" ) ||
+				  !strcmp( argv[ i ], "-hide-track" ) ||
+				  !strcmp( argv[ i ], "-hide-video" ) ||
+				  !strcmp( argv[ i ], "-hide-audio" ) )
 		{
 			if ( producer != NULL )
 				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( );
+			if ( playlist != NULL )
+			{
+				properties = mlt_playlist_properties( playlist );
+				if ( !strcmp( argv[ i ], "-hide-track" ) )
+					mlt_properties_set_int( properties, "hide", 3 );
+				else if ( !strcmp( argv[ i ], "-hide-video" ) )
+					mlt_properties_set_int( properties, "hide", 1 );
+				else if ( !strcmp( argv[ i ], "-hide-audio" ) )
+					mlt_properties_set_int( properties, "hide", 2 );
+			}
 		}
-		else if ( strstr( argv[ i ], "=" ) )
+		else if ( strchr( argv[ i ], '=' ) )
 		{
 			mlt_properties_parse( properties, argv[ i ] );
 		}
@@ -213,7 +188,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 );
@@ -234,27 +209,26 @@ 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 ) ) );
 
 	return mlt_tractor_producer( tractor );
 }
-