obscurer filter, consistency mods and bug fixes

[melted] / src / inigo / inigo.c

diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index cfef4fd..76edbc9 100644 (file)
--- 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,6 +57,7 @@ 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 );
@@ -63,7 +66,6 @@ static void transport_action( mlt_producer producer, char *value )
                                                last = time;
                                                fprintf( stderr, "%d: %lld\n", i, time );
                                        }
-                                       fprintf( stderr, "Current Position: %lld\n", mlt_producer_position( producer ) );
                                }
                                break;
 
@@ -120,6 +122,8 @@ 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 )
@@ -137,29 +141,37 @@ static mlt_consumer create_consumer( char *id, mlt_producer producer )
        return consumer;
 }
 
-static void transport( mlt_producer producer )
+static void transport( mlt_producer producer, mlt_consumer consumer )
 {
        mlt_properties properties = mlt_producer_properties( producer );
 
        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" );
+       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" );
+       }
 
-       while( mlt_properties_get_int( properties, "done" ) == 0 )
+       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: %10lld\r", mlt_producer_position( producer ) );
        }
+
+       fprintf( stderr, "\n" );
 }
 
 int main( int argc, char **argv )
@@ -173,6 +185,7 @@ int main( int argc, char **argv )
        // Construct the factory
        mlt_factory_init( getenv( "MLT_REPOSITORY" ) );
 
+       // Check for serialisation switch first
        for ( i = 1; i < argc; i ++ )
        {
                if ( !strcmp( argv[ i ], "-serialise" ) )
@@ -184,7 +197,8 @@ int main( int argc, char **argv )
        }
 
        // Get inigo producer
-       inigo = mlt_factory_producer( "inigo", &argv[ 1 ] );
+       if ( argc > 1 )
+               inigo = mlt_factory_producer( "inigo", &argv[ 1 ] );
 
        if ( argc > 1 && inigo != NULL && mlt_producer_get_length( inigo ) > 0 )
        {
@@ -245,7 +259,7 @@ int main( int argc, char **argv )
                        mlt_consumer_start( consumer );
 
                        // Transport functionality
-                       transport( inigo );
+                       transport( inigo, consumer );
 
                        // Stop the consumer
                        mlt_consumer_stop( consumer );