X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Finigo%2Fproducer_inigo.c;h=cf9d38c4df14e373077fd37b566702949cb82be6;hb=30bf05a2dc3d17d9cf87300e07e66828fd729c17;hp=2a46fed02730db9ec8e8a1e3f31785bef60964d3;hpb=702e73b84d90830062ebe07ba01b72ad59d48d93;p=melted

diff --git a/src/modules/inigo/producer_inigo.c b/src/modules/inigo/producer_inigo.c
index 2a46fed..cf9d38c 100644
--- a/src/modules/inigo/producer_inigo.c
+++ b/src/modules/inigo/producer_inigo.c
@@ -135,6 +135,9 @@ mlt_producer producer_inigo_init( char **argv )
 	mlt_multitrack multitrack = mlt_tractor_multitrack( tractor );
 	char *title = NULL;
 
+	// Assistance for template construction (allows -track usage to specify the first track)
+	mlt_properties_set_int( MLT_PLAYLIST_PROPERTIES( playlist ), "_inigo_first", 1 );
+
 	// We need to track the number of registered filters
 	mlt_properties_set_int( field_properties, "registered", 0 );
 
@@ -251,7 +254,11 @@ mlt_producer producer_inigo_init( char **argv )
 			if ( mlt_playlist_count( playlist ) > 0 )
 			{
 				mlt_playlist_clip_info info;
-				mlt_playlist_join( playlist, mlt_playlist_count( playlist ) - clips - 1, clips, 0 );
+				int clip = clips <= 0 ? 0 : mlt_playlist_count( playlist ) - clips - 1;
+				if ( clip < 0 ) clip = 0;
+				if ( clip >= mlt_playlist_count( playlist ) ) clip = mlt_playlist_count( playlist ) - 2;
+				if ( clips < 0 ) clips =  mlt_playlist_count( playlist ) - 1;
+				mlt_playlist_join( playlist, clip, clips, 0 );
 				mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
 				producer = info.cut;
 				properties = MLT_PRODUCER_PROPERTIES( producer );
@@ -361,7 +368,8 @@ mlt_producer producer_inigo_init( char **argv )
 			if ( producer != NULL && !mlt_producer_is_cut( producer ) )
 				mlt_playlist_append( playlist, producer );
 			producer = NULL;
-			if ( mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( playlist ) ) > 0 )
+			if ( !mlt_properties_get_int( MLT_PLAYLIST_PROPERTIES( playlist ), "_inigo_first" ) || 
+				  mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( playlist ) ) > 0 )
 			{
 				mlt_multitrack_connect( multitrack, MLT_PLAYLIST_PRODUCER( playlist ), track ++ );
 				track_service( field, playlist, ( mlt_destructor )mlt_playlist_close );
@@ -417,7 +425,8 @@ mlt_producer producer_inigo_init( char **argv )
 	track_service( field, playlist, ( mlt_destructor )mlt_playlist_close );
 
 	// We must have a playlist to connect
-	if ( mlt_playlist_count( playlist ) > 0 )
+	if ( !mlt_properties_get_int( MLT_PLAYLIST_PROPERTIES( playlist ), "_inigo_first" ) || 
+		  mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( playlist ) ) > 0 )
 		mlt_multitrack_connect( multitrack, MLT_PLAYLIST_PRODUCER( playlist ), track );
 
 	mlt_producer prod = MLT_TRACTOR_PRODUCER( tractor );