X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Finigo%2Finigo.c;h=e39b21d48080346f10ce5e5879170ed77a10e9ce;hb=9ad7cb6cdea367db7a720fa0335f8b8eccf0ae09;hp=38e0d13cebb5d8d0ac98c368e4c7ad3205a57166;hpb=cc8b6005abe30b5f0816b5aa6b87aa6867275228;p=melted diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c index 38e0d13..e39b21d 100644 --- 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 ] ) @@ -50,47 +52,78 @@ static void transport_action( mlt_producer producer, char *value ) case '9': mlt_producer_set_speed( producer, 10 ); break; + case 'd': + if ( multitrack != NULL ) + { + 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: %d\n", i, time ); + } + } + break; + case 'g': if ( multitrack != NULL ) { - mlt_timecode time = mlt_multitrack_clip( multitrack, mlt_whence_relative_current, 0 ); + mlt_position time = mlt_multitrack_clip( multitrack, mlt_whence_relative_current, 0 ); 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_producer producer = mlt_multitrack_producer( multitrack ); - int64_t position = mlt_producer_frame_position( producer, mlt_producer_position( producer ) ); + mlt_position position = mlt_producer_position( producer ); mlt_producer_set_speed( producer, 0 ); - mlt_producer_seek_frame( producer, position - 1 >= 0 ? position - 1 : 0 ); + mlt_producer_seek( producer, position - 1 ); } break; case 'j': if ( multitrack != NULL ) { - mlt_timecode time = mlt_multitrack_clip( multitrack, mlt_whence_relative_current, 1 ); + mlt_position time = mlt_multitrack_clip( multitrack, mlt_whence_relative_current, 1 ); mlt_producer_seek( producer, time ); } break; case 'k': if ( multitrack != NULL ) { - mlt_timecode time = mlt_multitrack_clip( multitrack, mlt_whence_relative_current, -1 ); + mlt_position time = mlt_multitrack_clip( multitrack, mlt_whence_relative_current, -1 ); mlt_producer_seek( producer, time ); } break; case 'l': - if ( multitrack != NULL ) + if ( producer != NULL ) { - mlt_producer producer = mlt_multitrack_producer( multitrack ); - int64_t position = mlt_producer_frame_position( producer, mlt_producer_position( producer ) ); + mlt_position position = mlt_producer_position( producer ); mlt_producer_set_speed( producer, 0 ); - mlt_producer_seek_frame( producer, position + 1 ); + 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; } } + + mlt_properties_set_int( properties, "stats_off", 0 ); } static mlt_consumer create_consumer( char *id, mlt_producer producer ) @@ -108,27 +141,41 @@ 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 ); + int silent = mlt_properties_get_int( mlt_consumer_properties( consumer ), "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" ); + if ( mlt_properties_get_int( properties, "done" ) == 0 && !mlt_consumer_is_stopped( consumer ) ) + { + if ( !silent ) + { + 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" ); + } - 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" ); + 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 ) - { - int value = term_read( ); - 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 ) ); + } + + if ( !silent ) + fprintf( stderr, "\n" ); } } @@ -141,8 +188,9 @@ 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 ++ ) { if ( !strcmp( argv[ i ], "-serialise" ) ) @@ -154,43 +202,44 @@ 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 ( inigo != NULL && mlt_producer_get_length( inigo ) > 0 ) + if ( argc > 1 && inigo != NULL && mlt_producer_get_length( inigo ) > 0 ) { // 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 ); // Parse the arguments for ( i = 1; i < argc; i ++ ) { - if ( !strcmp( argv[ i ], "-serialise" ) ) + if ( !strcmp( argv[ i ], "-consumer" ) ) { - i ++; + consumer = create_consumer( argv[ ++ i ], inigo ); + while ( argv[ i + 1 ] != NULL && strstr( argv[ i + 1 ], "=" ) ) + mlt_properties_parse( group, argv[ ++ i ] ); } - else if ( !strcmp( argv[ i ], "-consumer" ) ) + else if ( !strcmp( argv[ i ], "-serialise" ) ) { - consumer = create_consumer( argv[ ++ i ], inigo ); - while ( strstr( argv[ ++ i ], "=" ) ) - mlt_properties_parse( group, argv[ i ] ); - i --; + i ++; } else { if ( store != NULL ) fprintf( store, "%s\n", argv[ i ] ); + + i ++; + while ( argv[ i ] != NULL && argv[ i ][ 0 ] != '-' ) { - i ++; - if ( store != NULL && argv[ i ] != NULL && argv[ i ][ 0 ] != '-' ) + if ( store != NULL ) fprintf( store, "%s\n", argv[ i ] ); + i += 1; } + i --; } } @@ -205,34 +254,48 @@ 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 ); // Transport functionality - transport( inigo ); - - // Close the consumer - mlt_consumer_close( consumer ); + transport( inigo, consumer ); + + // Stop the consumer + mlt_consumer_stop( consumer ); } else if ( store != NULL ) { fprintf( stderr, "Project saved as %s.\n", name ); fclose( store ); } - - // Close the producer - mlt_producer_close( inigo ); } else { fprintf( stderr, "Usage: inigo [ -group [ name=value ]* ]\n" " [ -consumer id[:arg] [ name=value ]* ]\n" - " [ -filter id[:arg] [ name=value ] * ]\n" - " [ -transition id[:arg] [ name=value ] * ]\n" - " [ -blank time ]\n" - " [ producer [ 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" + " [ -blank frames ]\n" + " [ -track ]\n" + " [ -split relative-frame ]\n" + " [ -join clips ]\n" + " [ -repeat times ]\n" + " [ producer [ name=value ] * ]+\n" ); } + // Close the consumer + if ( consumer != NULL ) + mlt_consumer_close( consumer ); + + // Close the producer + if ( inigo != NULL ) + mlt_producer_close( inigo ); + // Close the factory mlt_factory_close( );