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

diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index b1f3e04..bc4ad7c 100644
--- a/src/inigo/inigo.c
+++ b/src/inigo/inigo.c
@@ -128,7 +128,7 @@ static void transport_action( mlt_producer producer, char *value )
 
 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 );
@@ -144,34 +144,40 @@ 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 ( mlt_properties_get_int( properties, "stats_off" ) == 0 )
-			fprintf( stderr, "Current Position: %10d\r", mlt_producer_position( producer ) );
-	}
+			if ( !silent && mlt_properties_get_int( properties, "stats_off" ) == 0 )
+				fprintf( stderr, "Current Position: %10d\r", mlt_producer_position( producer ) );
+		}
 
-	fprintf( stderr, "\n" );
+		if ( !silent )
+			fprintf( stderr, "\n" );
+	}
 }
 
 int main( int argc, char **argv )
@@ -241,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 )
 		{
@@ -271,13 +277,16 @@ int main( int argc, char **argv )
 	{
 		fprintf( stderr, "Usage: inigo [ -group [ name=value ]* ]\n"
 						 "             [ -consumer id[:arg] [ name=value ]* ]\n"
-        				 "             [ -filter filter[:arg] [ name=value ] * ]\n"
-        				 "             [ -attach filter[: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"
+						 "             [ -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