X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Finigo%2Finigo.c;h=bc4ad7c4cbeefe4886352f614cbbd55d98833205;hb=7cef152403bfa0ea30e4a3e102fe33bc75e508ab;hp=40c99b40730e9626dc1cdba8a7370cc7c0eaa602;hpb=16c5c516008b9debec7765e34f4756f8063dee7e;p=melted

diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index 40c99b4..bc4ad7c 100644
--- a/src/inigo/inigo.c
+++ b/src/inigo/inigo.c
@@ -11,6 +11,8 @@ static void transport_action( mlt_producer producer, char *value )
 	mlt_properties properties = mlt_producer_properties( producer );
 	mlt_multitrack multitrack = mlt_properties_get_data( properties, "multitrack", NULL );
 
+	mlt_properties_set_int( properties, "stats_off", 0 );
+
 	if ( strlen( value ) == 1 )
 	{
 		switch( value[ 0 ] )
@@ -55,15 +57,15 @@ static void transport_action( mlt_producer producer, char *value )
 				{
 					int i = 0;
 					mlt_position last = -1;
+					fprintf( stderr, "\n" );
 					for ( i = 0; 1; i ++ )
 					{
 						mlt_position time = mlt_multitrack_clip( multitrack, mlt_whence_relative_start, i );
 						if ( time == last )
 							break;
 						last = time;
-						fprintf( stderr, "%d: %lld\n", i, time );
+						fprintf( stderr, "%d: %d\n", i, time );
 					}
-					fprintf( stderr, "Current Position: %lld\n", mlt_producer_position( producer ) );
 				}
 				break;
 
@@ -120,11 +122,13 @@ static void transport_action( mlt_producer producer, char *value )
 				break;
 		}
 	}
+
+	mlt_properties_set_int( properties, "stats_off", 0 );
 }
 
 static mlt_consumer create_consumer( char *id, mlt_producer producer )
 {
-	char *arg = strchr( id, ':' );
+	char *arg = id != NULL ? strchr( id, ':' ) : NULL;
 	if ( arg != NULL )
 		*arg ++ = '\0';
 	mlt_consumer consumer = mlt_factory_consumer( id, arg );
@@ -140,28 +144,39 @@ static mlt_consumer create_consumer( char *id, mlt_producer producer )
 static void transport( mlt_producer producer, mlt_consumer consumer )
 {
 	mlt_properties properties = mlt_producer_properties( producer );
+	int silent = mlt_properties_get_int( mlt_consumer_properties( consumer ), "silent" );
 
-	term_init( );
 
 	if ( mlt_properties_get_int( properties, "done" ) == 0 && !mlt_consumer_is_stopped( consumer ) )
 	{
-		fprintf( stderr, "+-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+\n" );
-		fprintf( stderr, "|1=-10| |2= -5| |3= -2| |4= -1| |5=  0| |6=  1| |7=  2| |8=  5| |9= 10|\n" );
-		fprintf( stderr, "+-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+\n" );
-
-		fprintf( stderr, "+---------------------------------------------------------------------+\n" );
-		fprintf( stderr, "|               H = back 1 minute,  L = forward 1 minute              |\n" );
-		fprintf( stderr, "|                 h = previous frame,  l = next frame                 |\n" );
-		fprintf( stderr, "|           g = start of clip, j = next clip, k = previous clip       |\n" );
-		fprintf( stderr, "|                0 = restart, q = quit, space = play                  |\n" );
-		fprintf( stderr, "+---------------------------------------------------------------------+\n" );
-	}
+		if ( !silent )
+		{
+			term_init( );
+
+			fprintf( stderr, "+-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+\n" );
+			fprintf( stderr, "|1=-10| |2= -5| |3= -2| |4= -1| |5=  0| |6=  1| |7=  2| |8=  5| |9= 10|\n" );
+			fprintf( stderr, "+-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+\n" );
+
+			fprintf( stderr, "+---------------------------------------------------------------------+\n" );
+			fprintf( stderr, "|               H = back 1 minute,  L = forward 1 minute              |\n" );
+			fprintf( stderr, "|                 h = previous frame,  l = next frame                 |\n" );
+			fprintf( stderr, "|           g = start of clip, j = next clip, k = previous clip       |\n" );
+			fprintf( stderr, "|                0 = restart, q = quit, space = play                  |\n" );
+			fprintf( stderr, "+---------------------------------------------------------------------+\n" );
+		}
 
-	while( mlt_properties_get_int( properties, "done" ) == 0 && !mlt_consumer_is_stopped( consumer ) )
-	{
-		int value = term_read( );
-		if ( value != -1 )
-			transport_action( producer, ( char * )&value );
+		while( mlt_properties_get_int( properties, "done" ) == 0 && !mlt_consumer_is_stopped( consumer ) )
+		{
+			int value = term_read( );
+			if ( value != -1 )
+				transport_action( producer, ( char * )&value );
+
+			if ( !silent && mlt_properties_get_int( properties, "stats_off" ) == 0 )
+				fprintf( stderr, "Current Position: %10d\r", mlt_producer_position( producer ) );
+		}
+
+		if ( !silent )
+			fprintf( stderr, "\n" );
 	}
 }
 
@@ -174,7 +189,7 @@ int main( int argc, char **argv )
 	char *name = NULL;
 
 	// Construct the factory
-	mlt_factory_init( getenv( "MLT_REPOSITORY" ) );
+	mlt_factory_init( NULL );
 
 	// Check for serialisation switch first
 	for ( i = 1; i < argc; i ++ )
@@ -196,9 +211,6 @@ int main( int argc, char **argv )
 		// Get inigo's properties
 		mlt_properties inigo_props = mlt_producer_properties( inigo );
 
-		// Get the field service from inigo
-		mlt_field field = mlt_properties_get_data( inigo_props, "field", 0 );
-
 		// Get the last group
 		mlt_properties group = mlt_properties_get_data( inigo_props, "group", 0 );
 
@@ -235,7 +247,7 @@ int main( int argc, char **argv )
 
 		// If we have no consumer, default to sdl
 		if ( store == NULL && consumer == NULL )
-			consumer = create_consumer( "sdl", inigo );
+			consumer = create_consumer( NULL, inigo );
 
 		if ( consumer != NULL && store == NULL )
 		{
@@ -243,8 +255,8 @@ int main( int argc, char **argv )
 			mlt_properties properties = mlt_consumer_properties( consumer );
 			mlt_properties_inherit( properties, group );
 
-			// Connect consumer to tractor
-			mlt_consumer_connect( consumer, mlt_field_service( field ) );
+			// Connect consumer to inigo
+			mlt_consumer_connect( consumer, mlt_producer_service( inigo ) );
 
 			// Start the consumer
 			mlt_consumer_start( consumer );
@@ -265,11 +277,16 @@ int main( int argc, char **argv )
 	{
 		fprintf( stderr, "Usage: inigo [ -group [ name=value ]* ]\n"
 						 "             [ -consumer id[:arg] [ name=value ]* ]\n"
-        				 "             [ -filter id[:arg] [ name=value ] * ]\n"
-        				 "             [ -transition id[:arg] [ name=value ] * ]\n"
+						 "             [ -filter filter[:arg] [ name=value ] * ]\n"
+						 "             [ -attach filter[:arg] [ name=value ] * ]\n"
+						 "             [ -mix length [ -mixer transition ]* ]\n"
+						 "             [ -transition id[:arg] [ name=value ] * ]\n"
 						 "             [ -blank frames ]\n"
 						 "             [ -track ]\n"
-        				 "             [ producer [ name=value ] * ]+\n" );
+						 "             [ -split relative-frame ]\n"
+						 "             [ -join clips ]\n"
+						 "             [ -repeat times ]\n"
+						 "             [ producer [ name=value ] * ]+\n" );
 	}
 
 	// Close the consumer