X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Finigo%2Finigo.c;h=76edbc923785ace5729370f4b48681e4c2e72239;hb=75288bcb5a5a3925cf8e94ba12f034a0a8fd6758;hp=2dbda0e64850ac2f9021ea2a5ac49d4232d41cc1;hpb=6fba6c383f2d7845f9eedf9f4e5e099319cfb43f;p=melted diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c index 2dbda0e..76edbc9 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: %lld\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,28 +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" ); + 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 ) 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 ) @@ -143,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" ) ) @@ -154,9 +197,10 @@ 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 ); @@ -211,16 +255,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 { @@ -228,7 +276,8 @@ 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" ); }