Attempt at an aspect ratio clean up

[mlt] / src / inigo / inigo.c

diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index b1f3e04cb81282fbf6512645bd4be36c958c4756..bc2f156054119e0be233c91c75ebec863a0f2696 100644 (file)
--- 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,44 @@ 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 );
-
-       term_init( );
+       int silent = mlt_properties_get_int( mlt_consumer_properties( consumer ), "silent" );
+       struct timespec tm = { 0, 40000 };
 
        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 = silent ? -1 : term_read( );
 
-               if ( mlt_properties_get_int( properties, "stats_off" ) == 0 )
-                       fprintf( stderr, "Current Position: %10d\r", mlt_producer_position( producer ) );
-       }
+                       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 ) );
 
-       fprintf( stderr, "\n" );
+                       if ( silent )
+                               nanosleep( &tm, NULL );
+               }
+
+               if ( !silent )
+                       fprintf( stderr, "\n" );
+       }
 }
 
 int main( int argc, char **argv )
@@ -241,7 +251,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 +281,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