mlt_field field = mlt_tractor_field( tractor );
mlt_properties field_properties = mlt_field_properties( field );
mlt_multitrack multitrack = mlt_tractor_multitrack( tractor );
+ char *title = NULL;
// We need to track the number of registered filters
mlt_properties_set_int( field_properties, "registered", 0 );
if ( group != NULL )
properties = group;
}
- else if ( !strcmp( argv[ i ], "-attach" ) )
+ else if ( !strcmp( argv[ i ], "-attach" ) ||
+ !strcmp( argv[ i ], "-attach-cut" ) ||
+ !strcmp( argv[ i ], "-attach-clip" ) )
{
+ int type = !strcmp( argv[ i ], "-attach" ) ? 0 :
+ !strcmp( argv[ i ], "-attach-cut" ) ? 1 :
+ 2;
mlt_filter filter = create_attach( field, argv[ ++ i ], track );
- if ( filter != NULL )
+ if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+ {
+ mlt_playlist_clip_info info;
+ mlt_playlist_append( playlist, producer );
+ mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+ producer = info.cut;
+ }
+
+ if ( type == 1 || type == 2 )
{
- if ( properties != NULL )
+ mlt_playlist_clip_info info;
+ mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+ producer = info.cut;
+ }
+
+ if ( filter != NULL && mlt_playlist_count( playlist ) > 0 )
+ {
+ if ( type == 0 )
mlt_service_attach( ( mlt_service )properties, filter );
+ else if ( type == 1 )
+ mlt_service_attach( ( mlt_service )producer, filter );
+ else if ( type == 2 )
+ mlt_service_attach( ( mlt_service )mlt_producer_cut_parent( producer ), filter );
+
properties = mlt_filter_properties( filter );
mlt_properties_inherit( properties, group );
}
}
+ else if ( !strcmp( argv[ i ], "-repeat" ) )
+ {
+ int repeat = atoi( argv[ ++ i ] );
+ if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+ mlt_playlist_append( playlist, producer );
+ producer = NULL;
+ if ( mlt_playlist_count( playlist ) > 0 )
+ {
+ mlt_playlist_clip_info info;
+ mlt_playlist_repeat_clip( playlist, mlt_playlist_count( playlist ) - 1, repeat );
+ mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+ producer = info.cut;
+ properties = mlt_producer_properties( producer );
+ }
+ }
+ else if ( !strcmp( argv[ i ], "-split" ) )
+ {
+ int split = atoi( argv[ ++ i ] );
+ if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+ mlt_playlist_append( playlist, producer );
+ producer = NULL;
+ if ( mlt_playlist_count( playlist ) > 0 )
+ {
+ mlt_playlist_clip_info info;
+ mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+ split = split < 0 ? info.frame_out + split : split;
+ mlt_playlist_split( playlist, mlt_playlist_count( playlist ) - 1, split );
+ mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+ producer = info.cut;
+ properties = mlt_producer_properties( producer );
+ }
+ }
+ else if ( !strcmp( argv[ i ], "-swap" ) )
+ {
+ if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+ mlt_playlist_append( playlist, producer );
+ producer = NULL;
+ if ( mlt_playlist_count( playlist ) >= 2 )
+ {
+ mlt_playlist_clip_info info;
+ mlt_playlist_move( playlist, mlt_playlist_count( playlist ) - 2, mlt_playlist_count( playlist ) - 1 );
+ mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+ producer = info.cut;
+ properties = mlt_producer_properties( producer );
+ }
+ }
+ else if ( !strcmp( argv[ i ], "-join" ) )
+ {
+ int clips = atoi( argv[ ++ i ] );
+ if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+ mlt_playlist_append( playlist, producer );
+ producer = NULL;
+ if ( mlt_playlist_count( playlist ) > 0 )
+ {
+ mlt_playlist_clip_info info;
+ mlt_playlist_join( playlist, mlt_playlist_count( playlist ) - clips - 1, clips, 0 );
+ mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+ producer = info.cut;
+ properties = mlt_producer_properties( producer );
+ }
+ }
+ else if ( !strcmp( argv[ i ], "-remove" ) )
+ {
+ if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+ mlt_playlist_append( playlist, producer );
+ producer = NULL;
+ if ( mlt_playlist_count( playlist ) > 0 )
+ {
+ mlt_playlist_clip_info info;
+ mlt_playlist_remove( playlist, mlt_playlist_count( playlist ) - 1 );
+ mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+ producer = info.cut;
+ properties = mlt_producer_properties( producer );
+ }
+ }
else if ( !strcmp( argv[ i ], "-mix" ) )
{
int length = atoi( argv[ ++ i ] );
- if ( producer != NULL )
+ if ( producer != NULL && !mlt_producer_is_cut( producer ) )
mlt_playlist_append( playlist, producer );
producer = NULL;
if ( mlt_playlist_count( playlist ) >= 2 )
{
mlt_playlist_clip_info info;
mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
- if ( mlt_properties_get_int( ( mlt_properties )info.producer, "mlt_mix" ) == 0 )
+ if ( mlt_properties_get_data( ( mlt_properties )info.producer, "mlt_mix", NULL ) == NULL )
mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 2 );
- mix = ( mlt_tractor )info.producer;
+ mix = ( mlt_tractor )mlt_properties_get_data( ( mlt_properties )info.producer, "mlt_mix", NULL );
+ properties = NULL;
}
else
{
fprintf( stderr, "Invalid position for a mix...\n" );
}
}
- else if ( !strcmp( argv[ i ], "-filter" ) )
- {
- mlt_filter filter = create_filter( field, argv[ ++ i ], track );
- if ( filter != NULL )
- {
- properties = mlt_filter_properties( filter );
- mlt_properties_inherit( properties, group );
- }
- }
- else if ( !strcmp( argv[ i ], "-transition" ) )
- {
- mlt_transition transition = create_transition( field, argv[ ++ i ], track - 1 );
- if ( transition != NULL )
- {
- properties = mlt_transition_properties( transition );
- mlt_properties_inherit( properties, group );
- }
- }
else if ( !strcmp( argv[ i ], "-mixer" ) )
{
if ( mix != NULL )
fprintf( stderr, "Invalid mixer...\n" );
}
}
+ else if ( !strcmp( argv[ i ], "-filter" ) )
+ {
+ mlt_filter filter = create_filter( field, argv[ ++ i ], track );
+ if ( filter != NULL )
+ {
+ properties = mlt_filter_properties( filter );
+ mlt_properties_inherit( properties, group );
+ }
+ }
+ else if ( !strcmp( argv[ i ], "-transition" ) )
+ {
+ mlt_transition transition = create_transition( field, argv[ ++ i ], track - 1 );
+ if ( transition != NULL )
+ {
+ properties = mlt_transition_properties( transition );
+ mlt_properties_inherit( properties, group );
+ }
+ }
else if ( !strcmp( argv[ i ], "-blank" ) )
{
- if ( producer != NULL )
+ if ( producer != NULL && !mlt_producer_is_cut( producer ) )
mlt_playlist_append( playlist, producer );
producer = NULL;
mlt_playlist_blank( playlist, atof( argv[ ++ i ] ) );
!strcmp( argv[ i ], "-hide-video" ) ||
!strcmp( argv[ i ], "-hide-audio" ) )
{
- if ( producer != NULL )
+ if ( producer != NULL && !mlt_producer_is_cut( producer ) )
mlt_playlist_append( playlist, producer );
producer = NULL;
mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), track ++ );
}
else if ( argv[ i ][ 0 ] != '-' )
{
- if ( producer != NULL )
+ if ( producer != NULL && !mlt_producer_is_cut( producer ) )
mlt_playlist_append( playlist, producer );
+ if ( title == NULL )
+ title = argv[ i ];
producer = create_producer( field, argv[ i ] );
if ( producer != NULL )
{
}
// Connect last producer to playlist
- if ( producer != NULL )
+ if ( producer != NULL && !mlt_producer_is_cut( producer ) )
mlt_playlist_append( playlist, producer );
// Track the last playlist too
mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), track );
mlt_producer prod = mlt_tractor_producer( tractor );
+ mlt_producer_optimise( prod );
mlt_properties props = mlt_tractor_properties( tractor );
mlt_properties_set_data( props, "group", group, 0, ( mlt_destructor )mlt_properties_close, NULL );
mlt_properties_set_position( props, "length", mlt_producer_get_out( mlt_multitrack_producer( multitrack ) ) + 1 );
mlt_producer_set_in_and_out( prod, 0, mlt_producer_get_out( mlt_multitrack_producer( multitrack ) ) );
mlt_properties_set_double( props, "fps", mlt_producer_get_fps( mlt_multitrack_producer( multitrack ) ) );
+ if ( title != NULL )
+ mlt_properties_set( props, "title", strchr( title, '/' ) ? strrchr( title, '/' ) + 1 : title );
return prod;
}
projects / melted / blobdiff