case '9':
mlt_producer_set_speed( producer, 10 );
break;
+ case 'd':
+ if ( multitrack != NULL )
+ {
+ int i = 0;
+ mlt_position last = -1;
+ 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, "Current Position: %lld\n", mlt_producer_position( producer ) );
+ }
+ 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;
}
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 )
// 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" ) )
}
// 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 );
// Parse the arguments
for ( i = 1; i < argc; i ++ )
{
- if ( !strcmp( argv[ i ], "-serialise" ) )
- {
- i ++;
- }
- else if ( !strcmp( argv[ i ], "-consumer" ) )
+ if ( !strcmp( argv[ i ], "-consumer" ) )
{
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 ], "-serialise" ) )
+ {
+ i ++;
+ }
else
{
if ( store != NULL )
fprintf( store, "%s\n", argv[ i ] );
+
+ i ++;
+
while ( argv[ i ] != NULL && argv[ i ][ 0 ] != '-' )
{
- i += 2;
- if ( store != NULL && argv[ i ] != NULL && argv[ i ][ 0 ] != '-' )
+ if ( store != NULL )
fprintf( store, "%s\n", argv[ i ] );
+ i += 1;
}
+
i --;
}
}
// 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
{
" [ -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" );
}
projects / mlt / blobdiff