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

diff --git a/src/modules/inigo/producer_inigo.c b/src/modules/inigo/producer_inigo.c
index 2a46fed..6de5578 100644
--- a/src/modules/inigo/producer_inigo.c
+++ b/src/modules/inigo/producer_inigo.c
@@ -3,19 +3,19 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "producer_inigo.h"
@@ -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 );
@@ -426,7 +435,6 @@ mlt_producer producer_inigo_init( char **argv )
 	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 ) ) );
 	if ( title != NULL )
 		mlt_properties_set( props, "title", strchr( title, '/' ) ? strrchr( title, '/' ) + 1 : title );