X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Finigo%2Fproducer_inigo.c;h=ce25564ce12cd9f8b0ee0d9637abb3d975f75082;hb=519393231e6ab626f19bd01d4622d1c3759fcc93;hp=83434cf8b1fe3aa4074fc6c70cb9e3fe6f05427e;hpb=363d095af9149cc181e92a35d2e34e583d061747;p=melted

diff --git a/src/modules/inigo/producer_inigo.c b/src/modules/inigo/producer_inigo.c
index 83434cf..ce25564 100644
--- a/src/modules/inigo/producer_inigo.c
+++ b/src/modules/inigo/producer_inigo.c
@@ -121,6 +121,7 @@ mlt_producer producer_inigo_init( char **argv )
 	int i;
 	int track = 0;
 	mlt_producer producer = NULL;
+	mlt_tractor mix = NULL;
 	mlt_playlist playlist = mlt_playlist_init( );
 	mlt_properties group = mlt_properties_new( );
 	mlt_properties properties = group;
@@ -128,6 +129,7 @@ mlt_producer producer_inigo_init( char **argv )
 	mlt_field field = mlt_tractor_field( tractor );
 	mlt_properties field_properties = mlt_field_properties( field );
 	mlt_multitrack multitrack = mlt_tractor_multitrack( tractor );
+	char *title = NULL;
 
 	// We need to track the number of registered filters
 	mlt_properties_set_int( field_properties, "registered", 0 );
@@ -156,6 +158,32 @@ mlt_producer producer_inigo_init( char **argv )
 				mlt_properties_inherit( properties, group );
 			}
 		}
+		else if ( !strcmp( argv[ i ], "-mix" ) )
+		{
+			int length = atoi( argv[ ++ i ] );
+			if ( producer != NULL )
+				mlt_playlist_append( playlist, producer );
+			producer = NULL;
+			if ( mlt_playlist_count( playlist ) >= 2 )
+			{
+				if ( mlt_playlist_mix( playlist, mlt_playlist_count( playlist ) - 2, length, NULL ) == 0 )
+				{
+					mlt_playlist_clip_info info;
+					mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+					if ( mlt_properties_get_int( ( mlt_properties )info.producer, "mlt_mix" ) == 0 )
+						mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 2 );
+					mix = ( mlt_tractor )info.producer;
+				}
+				else
+				{
+					fprintf( stderr, "Mix failed?\n" );
+				}
+			}
+			else
+			{
+				fprintf( stderr, "Invalid position for a mix...\n" );
+			}
+		}
 		else if ( !strcmp( argv[ i ], "-filter" ) )
 		{
 			mlt_filter filter = create_filter( field, argv[ ++ i ], track );
@@ -174,6 +202,33 @@ mlt_producer producer_inigo_init( char **argv )
 				mlt_properties_inherit( properties, group );
 			}
 		}
+		else if ( !strcmp( argv[ i ], "-mixer" ) )
+		{
+			if ( mix != NULL )
+			{
+				char *id = strdup( argv[ ++ i ] );
+				char *arg = strchr( id, ':' );
+				mlt_field field = mlt_tractor_field( mix );
+				mlt_transition transition = NULL;
+				if ( arg != NULL )
+					*arg ++ = '\0';
+				transition = mlt_factory_transition( id, arg );
+				if ( transition != NULL )
+				{
+					properties = mlt_transition_properties( transition );
+					mlt_properties_inherit( properties, group );
+					mlt_field_plant_transition( field, transition, 0, 1 );
+					mlt_properties_set_position( properties, "in", 0 );
+					mlt_properties_set_position( properties, "out", mlt_producer_get_out( ( mlt_producer )mix ) );
+					mlt_transition_close( transition );
+				}
+				free( id );
+			}
+			else
+			{
+				fprintf( stderr, "Invalid mixer...\n" );
+			}
+		}
 		else if ( !strcmp( argv[ i ], "-blank" ) )
 		{
 			if ( producer != NULL )
@@ -211,6 +266,8 @@ mlt_producer producer_inigo_init( char **argv )
 		{
 			if ( producer != NULL )
 				mlt_playlist_append( playlist, producer );
+			if ( title == NULL )
+				title = argv[ i ];
 			producer = create_producer( field, argv[ i ] );
 			if ( producer != NULL )
 			{
@@ -249,6 +306,8 @@ mlt_producer producer_inigo_init( char **argv )
 	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 ) ) );
+	if ( title != NULL )
+		mlt_properties_set( props, "title", strchr( title, '/' ) ? strrchr( title, '/' ) + 1 : title );
 
 	return prod;
 }