Added avformat

[melted] / src / inigo / inigo.c

diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index c8552c3..40c99b4 100644 (file)
--- a/src/inigo/inigo.c
+++ b/src/inigo/inigo.c
@@ -63,6 +63,7 @@ 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;
 
@@ -73,12 +74,19 @@ static void transport_action( mlt_producer producer, char *value )
                                        mlt_producer_seek( producer, time );
                                }
                                break;
+                       case 'H':
+                               if ( producer != NULL )
+                               {
+                                       mlt_position position = mlt_producer_position( producer );
+                                       mlt_producer_seek( producer, position - ( mlt_producer_get_fps( producer ) * 60 ) );
+                               }
+                               break;
                        case 'h':
-                               if ( multitrack != NULL )
+                               if ( producer != NULL )
                                {
                                        mlt_position position = mlt_producer_position( producer );
                                        mlt_producer_set_speed( producer, 0 );
-                                       mlt_producer_seek( producer, position - 1 >= 0 ? position - 1 : 0 );
+                                       mlt_producer_seek( producer, position - 1 );
                                }
                                break;
                        case 'j':
@@ -96,13 +104,20 @@ static void transport_action( mlt_producer producer, char *value )
                                }
                                break;
                        case 'l':
-                               if ( multitrack != NULL )
+                               if ( producer != NULL )
                                {
                                        mlt_position position = mlt_producer_position( producer );
                                        mlt_producer_set_speed( producer, 0 );
                                        mlt_producer_seek( producer, position + 1 );
                                }
                                break;
+                       case 'L':
+                               if ( producer != NULL )
+                               {
+                                       mlt_position position = mlt_producer_position( producer );
+                                       mlt_producer_seek( producer, position + ( mlt_producer_get_fps( producer ) * 60 ) );
+                               }
+                               break;
                }
        }
 }
@@ -122,23 +137,27 @@ 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" );
+       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 = previous,  l = next                        |\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" );
+               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 )
@@ -157,6 +176,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" ) )
@@ -168,7 +188,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 )
        {
@@ -225,15 +246,20 @@ int main( int argc, char **argv )
                        // Connect consumer to tractor
                        mlt_consumer_connect( consumer, mlt_field_service( field ) );
 
+                       // Start the consumer
+                       mlt_consumer_start( consumer );
+
                        // Transport functionality
-                       transport( inigo );
+                       transport( inigo, consumer );
+
+                       // Stop the consumer
+                       mlt_consumer_stop( consumer );
                }
                else if ( store != NULL )
                {
                        fprintf( stderr, "Project saved as %s.\n", name );
                        fclose( store );
                }
-
        }
        else
        {
@@ -241,7 +267,7 @@ int main( int argc, char **argv )
                                                 "             [ -consumer id[:arg] [ name=value ]* ]\n"
                                         "             [ -filter id[:arg] [ name=value ] * ]\n"
                                         "             [ -transition id[:arg] [ name=value ] * ]\n"
-                                                "             [ -blank time ]\n"
+                                                "             [ -blank frames ]\n"
                                                 "             [ -track ]\n"
                                         "             [ producer [ name=value ] * ]+\n" );
        }