Filter attachments to services

[melted] / src / inigo / inigo.c

diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index 40c99b4..91b283a 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,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,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 )
@@ -162,7 +166,12 @@ static void transport( mlt_producer producer, mlt_consumer 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 ) );
        }
+
+       fprintf( stderr, "\n" );
 }
 
 int main( int argc, char **argv )
@@ -174,7 +183,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 +205,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 );
 
@@ -243,8 +249,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,7 +271,8 @@ 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"
+                                        "             [ -filter filter[:arg] [ name=value ] * ]\n"
+                                        "             [ -attach filter[:arg] [ name=value ] * ]\n"
                                         "             [ -transition id[:arg] [ name=value ] * ]\n"
                                                 "             [ -blank frames ]\n"
                                                 "             [ -track ]\n"