X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Finigo%2Fproducer_inigo.c;h=80aee87c5d3a2f07e41c94324fc294b6e0a231ff;hb=de477d594bdd9c5d9ee2d3441cd0ccf49ab52feb;hp=ce25564ce12cd9f8b0ee0d9637abb3d975f75082;hpb=8cf0f77981284b7549c811b67283eb73d0c520d6;p=melted

diff --git a/src/modules/inigo/producer_inigo.c b/src/modules/inigo/producer_inigo.c
index ce25564..80aee87 100644
--- a/src/modules/inigo/producer_inigo.c
+++ b/src/modules/inigo/producer_inigo.c
@@ -147,21 +147,121 @@ mlt_producer producer_inigo_init( char **argv )
 			if ( group != NULL )
 				properties = group;
 		}
-		else if ( !strcmp( argv[ i ], "-attach" ) )
+		else if ( !strcmp( argv[ i ], "-attach" ) || 
+				  !strcmp( argv[ i ], "-attach-cut" ) ||
+				  !strcmp( argv[ i ], "-attach-clip" ) )
 		{
+			int type = !strcmp( argv[ i ], "-attach" ) ? 0 : 
+					   !strcmp( argv[ i ], "-attach-cut" ) ? 1 : 
+					   2;
 			mlt_filter filter = create_attach( field, argv[ ++ i ], track );
-			if ( filter != NULL )
+			if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+			{
+				mlt_playlist_clip_info info;
+				mlt_playlist_append( playlist, producer );
+				mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+				producer = info.cut;
+			}
+
+			if ( type == 1 || type == 2 )
 			{
-				if ( properties != NULL )
+				mlt_playlist_clip_info info;
+				mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+				producer = info.cut;
+			}
+
+			if ( filter != NULL && mlt_playlist_count( playlist ) > 0 )
+			{
+				if ( type == 0 )
 					mlt_service_attach( ( mlt_service )properties, filter );
+				else if ( type == 1 )
+					mlt_service_attach( ( mlt_service )producer, filter );
+				else if ( type == 2 )
+					mlt_service_attach( ( mlt_service )mlt_producer_cut_parent( producer ), filter );
+
 				properties = mlt_filter_properties( filter );
 				mlt_properties_inherit( properties, group );
 			}
 		}
+		else if ( !strcmp( argv[ i ], "-repeat" ) )
+		{
+			int repeat = atoi( argv[ ++ i ] );
+			if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+				mlt_playlist_append( playlist, producer );
+			producer = NULL;
+			if ( mlt_playlist_count( playlist ) > 0 )
+			{
+				mlt_playlist_clip_info info;
+				mlt_playlist_repeat_clip( playlist, mlt_playlist_count( playlist ) - 1, repeat );
+				mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+				producer = info.cut;
+				properties = mlt_producer_properties( producer );
+			}
+		}
+		else if ( !strcmp( argv[ i ], "-split" ) )
+		{
+			int split = atoi( argv[ ++ i ] );
+			if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+				mlt_playlist_append( playlist, producer );
+			producer = NULL;
+			if ( mlt_playlist_count( playlist ) > 0 )
+			{
+				mlt_playlist_clip_info info;
+				mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+				split = split < 0 ? info.frame_out + split : split;
+				mlt_playlist_split( playlist, mlt_playlist_count( playlist ) - 1, split );
+				mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+				producer = info.cut;
+				properties = mlt_producer_properties( producer );
+			}
+		}
+		else if ( !strcmp( argv[ i ], "-swap" ) )
+		{
+			if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+				mlt_playlist_append( playlist, producer );
+			producer = NULL;
+			if ( mlt_playlist_count( playlist ) >= 2 )
+			{
+				mlt_playlist_clip_info info;
+				mlt_playlist_move( playlist, mlt_playlist_count( playlist ) - 2, mlt_playlist_count( playlist ) - 1 );
+				mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+				producer = info.cut;
+				properties = mlt_producer_properties( producer );
+			}
+		}
+		else if ( !strcmp( argv[ i ], "-join" ) )
+		{
+			int clips = atoi( argv[ ++ i ] );
+			if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+				mlt_playlist_append( playlist, producer );
+			producer = NULL;
+			if ( mlt_playlist_count( playlist ) > 0 )
+			{
+				mlt_playlist_clip_info info;
+				mlt_playlist_join( playlist, mlt_playlist_count( playlist ) - clips - 1, clips, 0 );
+				mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+				producer = info.cut;
+				properties = mlt_producer_properties( producer );
+			}
+		}
+		else if ( !strcmp( argv[ i ], "-remove" ) )
+		{
+			if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+				mlt_playlist_append( playlist, producer );
+			producer = NULL;
+			if ( mlt_playlist_count( playlist ) > 0 )
+			{
+				mlt_playlist_clip_info info;
+				mlt_playlist_remove( playlist, mlt_playlist_count( playlist ) - 1 );
+				mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+				producer = info.cut;
+				properties = mlt_producer_properties( producer );
+			}
+		}
 		else if ( !strcmp( argv[ i ], "-mix" ) )
 		{
 			int length = atoi( argv[ ++ i ] );
-			if ( producer != NULL )
+			if ( producer != NULL && !mlt_producer_is_cut( producer ) )
 				mlt_playlist_append( playlist, producer );
 			producer = NULL;
 			if ( mlt_playlist_count( playlist ) >= 2 )
@@ -170,9 +270,10 @@ mlt_producer producer_inigo_init( char **argv )
 				{
 					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 )
+					if ( mlt_properties_get_data( ( mlt_properties )info.producer, "mlt_mix", NULL ) == NULL )
 						mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 2 );
-					mix = ( mlt_tractor )info.producer;
+					mix = ( mlt_tractor )mlt_properties_get_data( ( mlt_properties )info.producer, "mlt_mix", NULL );
+					properties = NULL;
 				}
 				else
 				{
@@ -184,24 +285,6 @@ mlt_producer producer_inigo_init( char **argv )
 				fprintf( stderr, "Invalid position for a mix...\n" );
 			}
 		}
-		else if ( !strcmp( argv[ i ], "-filter" ) )
-		{
-			mlt_filter filter = create_filter( field, argv[ ++ i ], track );
-			if ( filter != NULL )
-			{
-				properties = mlt_filter_properties( filter );
-				mlt_properties_inherit( properties, group );
-			}
-		}
-		else if ( !strcmp( argv[ i ], "-transition" ) )
-		{
-			mlt_transition transition = create_transition( field, argv[ ++ i ], track - 1 );
-			if ( transition != NULL )
-			{
-				properties = mlt_transition_properties( transition );
-				mlt_properties_inherit( properties, group );
-			}
-		}
 		else if ( !strcmp( argv[ i ], "-mixer" ) )
 		{
 			if ( mix != NULL )
@@ -229,9 +312,27 @@ mlt_producer producer_inigo_init( char **argv )
 				fprintf( stderr, "Invalid mixer...\n" );
 			}
 		}
+		else if ( !strcmp( argv[ i ], "-filter" ) )
+		{
+			mlt_filter filter = create_filter( field, argv[ ++ i ], track );
+			if ( filter != NULL )
+			{
+				properties = mlt_filter_properties( filter );
+				mlt_properties_inherit( properties, group );
+			}
+		}
+		else if ( !strcmp( argv[ i ], "-transition" ) )
+		{
+			mlt_transition transition = create_transition( field, argv[ ++ i ], track - 1 );
+			if ( transition != NULL )
+			{
+				properties = mlt_transition_properties( transition );
+				mlt_properties_inherit( properties, group );
+			}
+		}
 		else if ( !strcmp( argv[ i ], "-blank" ) )
 		{
-			if ( producer != NULL )
+			if ( producer != NULL && !mlt_producer_is_cut( producer ) )
 				mlt_playlist_append( playlist, producer );
 			producer = NULL;
 			mlt_playlist_blank( playlist, atof( argv[ ++ i ] ) );
@@ -241,7 +342,7 @@ mlt_producer producer_inigo_init( char **argv )
 				  !strcmp( argv[ i ], "-hide-video" ) ||
 				  !strcmp( argv[ i ], "-hide-audio" ) )
 		{
-			if ( producer != NULL )
+			if ( producer != NULL && !mlt_producer_is_cut( producer ) )
 				mlt_playlist_append( playlist, producer );
 			producer = NULL;
 			mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), track ++ );
@@ -264,7 +365,7 @@ mlt_producer producer_inigo_init( char **argv )
 		}
 		else if ( argv[ i ][ 0 ] != '-' )
 		{
-			if ( producer != NULL )
+			if ( producer != NULL && !mlt_producer_is_cut( producer ) )
 				mlt_playlist_append( playlist, producer );
 			if ( title == NULL )
 				title = argv[ i ];
@@ -290,7 +391,7 @@ mlt_producer producer_inigo_init( char **argv )
 	}
 
 	// Connect last producer to playlist
-	if ( producer != NULL )
+	if ( producer != NULL && !mlt_producer_is_cut( producer ) )
 		mlt_playlist_append( playlist, producer );
 
 	// Track the last playlist too
@@ -301,6 +402,7 @@ mlt_producer producer_inigo_init( char **argv )
 		mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), track );
 
 	mlt_producer prod = mlt_tractor_producer( tractor );
+	mlt_producer_optimise( prod );
 	mlt_properties props = mlt_tractor_properties( tractor );
 	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 );