X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Finigo%2Fproducer_inigo.c;h=2a46fed02730db9ec8e8a1e3f31785bef60964d3;hb=bc6274668d39c754532465f95c5c317718180251;hp=31368cb00e329cfa7024691768280db8e5bb4575;hpb=1c51b358cbde8c1a8623d140e64fdc19bcbcb508;p=melted diff --git a/src/modules/inigo/producer_inigo.c b/src/modules/inigo/producer_inigo.c index 31368cb..2a46fed 100644 --- a/src/modules/inigo/producer_inigo.c +++ b/src/modules/inigo/producer_inigo.c @@ -47,7 +47,7 @@ mlt_producer producer_inigo_file_init( char *file ) if ( result != NULL ) { - mlt_properties properties = mlt_producer_properties( result ); + mlt_properties properties = MLT_PRODUCER_PROPERTIES( result ); mlt_properties_set( properties, "resource", file ); } @@ -79,26 +79,30 @@ static mlt_producer create_producer( mlt_field field, char *file ) static mlt_filter create_attach( mlt_field field, char *id, int track ) { - char *arg = strchr( id, ':' ); + char *temp = strdup( id ); + char *arg = strchr( temp, ':' ); if ( arg != NULL ) *arg ++ = '\0'; - mlt_filter filter = mlt_factory_filter( id, arg ); + mlt_filter filter = mlt_factory_filter( temp, arg ); if ( filter != NULL ) track_service( field, filter, ( mlt_destructor )mlt_filter_close ); + free( temp ); return filter; } static mlt_filter create_filter( mlt_field field, char *id, int track ) { - char *arg = strchr( id, ':' ); + char *temp = strdup( id ); + char *arg = strchr( temp, ':' ); if ( arg != NULL ) *arg ++ = '\0'; - mlt_filter filter = mlt_factory_filter( id, arg ); + mlt_filter filter = mlt_factory_filter( temp, arg ); if ( filter != NULL ) { mlt_field_plant_filter( field, filter, track ); track_service( field, filter, ( mlt_destructor )mlt_filter_close ); } + free( temp ); return filter; } @@ -124,8 +128,8 @@ mlt_producer producer_inigo_init( char **argv ) mlt_tractor mix = NULL; mlt_playlist playlist = mlt_playlist_init( ); mlt_properties group = mlt_properties_new( ); - mlt_properties properties = group; mlt_tractor tractor = mlt_tractor_new( ); + mlt_properties properties = MLT_TRACTOR_PROPERTIES( tractor ); mlt_field field = mlt_tractor_field( tractor ); mlt_properties field_properties = mlt_field_properties( field ); mlt_multitrack multitrack = mlt_tractor_multitrack( tractor ); @@ -149,11 +153,12 @@ mlt_producer producer_inigo_init( char **argv ) } else if ( !strcmp( argv[ i ], "-attach" ) || !strcmp( argv[ i ], "-attach-cut" ) || + !strcmp( argv[ i ], "-attach-track" ) || !strcmp( argv[ i ], "-attach-clip" ) ) { int type = !strcmp( argv[ i ], "-attach" ) ? 0 : !strcmp( argv[ i ], "-attach-cut" ) ? 1 : - 2; + !strcmp( argv[ i ], "-attach-track" ) ? 2 : 3; mlt_filter filter = create_attach( field, argv[ ++ i ], track ); if ( producer != NULL && !mlt_producer_is_cut( producer ) ) { @@ -177,9 +182,17 @@ mlt_producer producer_inigo_init( char **argv ) else if ( type == 1 ) mlt_service_attach( ( mlt_service )producer, filter ); else if ( type == 2 ) + mlt_service_attach( ( mlt_service )playlist, filter ); + else if ( type == 3 ) mlt_service_attach( ( mlt_service )mlt_producer_cut_parent( producer ), filter ); - properties = mlt_filter_properties( filter ); + properties = MLT_FILTER_PROPERTIES( filter ); + mlt_properties_inherit( properties, group ); + } + else if ( filter != NULL ) + { + mlt_service_attach( ( mlt_service )playlist, filter ); + properties = MLT_FILTER_PROPERTIES( filter ); mlt_properties_inherit( properties, group ); } } @@ -195,7 +208,7 @@ mlt_producer producer_inigo_init( char **argv ) 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 ); + properties = MLT_PRODUCER_PROPERTIES( producer ); } } else if ( !strcmp( argv[ i ], "-split" ) ) @@ -212,7 +225,7 @@ mlt_producer producer_inigo_init( char **argv ) 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 ); + properties = MLT_PRODUCER_PROPERTIES( producer ); } } else if ( !strcmp( argv[ i ], "-swap" ) ) @@ -226,7 +239,7 @@ mlt_producer producer_inigo_init( char **argv ) 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 ); + properties = MLT_PRODUCER_PROPERTIES( producer ); } } else if ( !strcmp( argv[ i ], "-join" ) ) @@ -241,7 +254,7 @@ mlt_producer producer_inigo_init( char **argv ) 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 ); + properties = MLT_PRODUCER_PROPERTIES( producer ); } } else if ( !strcmp( argv[ i ], "-remove" ) ) @@ -255,7 +268,7 @@ mlt_producer producer_inigo_init( char **argv ) 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 ); + properties = MLT_PRODUCER_PROPERTIES( producer ); } } else if ( !strcmp( argv[ i ], "-mix" ) ) @@ -298,7 +311,7 @@ mlt_producer producer_inigo_init( char **argv ) transition = mlt_factory_transition( id, arg ); if ( transition != NULL ) { - properties = mlt_transition_properties( transition ); + properties = MLT_TRANSITION_PROPERTIES( transition ); mlt_properties_inherit( properties, group ); mlt_field_plant_transition( field, transition, 0, 1 ); mlt_properties_set_position( properties, "in", 0 ); @@ -317,7 +330,7 @@ mlt_producer producer_inigo_init( char **argv ) mlt_filter filter = create_filter( field, argv[ ++ i ], track ); if ( filter != NULL ) { - properties = mlt_filter_properties( filter ); + properties = MLT_FILTER_PROPERTIES( filter ); mlt_properties_inherit( properties, group ); } } @@ -326,7 +339,7 @@ mlt_producer producer_inigo_init( char **argv ) mlt_transition transition = create_transition( field, argv[ ++ i ], track - 1 ); if ( transition != NULL ) { - properties = mlt_transition_properties( transition ); + properties = MLT_TRANSITION_PROPERTIES( transition ); mlt_properties_inherit( properties, group ); } } @@ -338,6 +351,9 @@ mlt_producer producer_inigo_init( char **argv ) mlt_playlist_blank( playlist, atof( argv[ ++ i ] ) ); } else if ( !strcmp( argv[ i ], "-track" ) || + !strcmp( argv[ i ], "-null-track" ) || + !strcmp( argv[ i ], "-video-track" ) || + !strcmp( argv[ i ], "-audio-track" ) || !strcmp( argv[ i ], "-hide-track" ) || !strcmp( argv[ i ], "-hide-video" ) || !strcmp( argv[ i ], "-hide-audio" ) ) @@ -345,21 +361,24 @@ mlt_producer producer_inigo_init( char **argv ) if ( producer != NULL && !mlt_producer_is_cut( producer ) ) mlt_playlist_append( playlist, producer ); producer = NULL; - mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), track ++ ); - track_service( field, playlist, ( mlt_destructor )mlt_playlist_close ); - playlist = mlt_playlist_init( ); + if ( mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( playlist ) ) > 0 ) + { + mlt_multitrack_connect( multitrack, MLT_PLAYLIST_PRODUCER( playlist ), track ++ ); + track_service( field, playlist, ( mlt_destructor )mlt_playlist_close ); + playlist = mlt_playlist_init( ); + } if ( playlist != NULL ) { - properties = mlt_playlist_properties( playlist ); - if ( !strcmp( argv[ i ], "-hide-track" ) ) + properties = MLT_PLAYLIST_PROPERTIES( playlist ); + if ( !strcmp( argv[ i ], "-null-track" ) || !strcmp( argv[ i ], "-hide-track" ) ) mlt_properties_set_int( properties, "hide", 3 ); - else if ( !strcmp( argv[ i ], "-hide-video" ) ) + else if ( !strcmp( argv[ i ], "-audio-track" ) || !strcmp( argv[ i ], "-hide-video" ) ) mlt_properties_set_int( properties, "hide", 1 ); - else if ( !strcmp( argv[ i ], "-hide-audio" ) ) + else if ( !strcmp( argv[ i ], "-video-track" ) || !strcmp( argv[ i ], "-hide-audio" ) ) mlt_properties_set_int( properties, "hide", 2 ); } } - else if ( strchr( argv[ i ], '=' ) ) + else if ( strchr( argv[ i ], '=' ) && strstr( argv[ i ], " 0 ) - mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), track ); + mlt_multitrack_connect( multitrack, MLT_PLAYLIST_PRODUCER( playlist ), track ); - mlt_producer prod = mlt_tractor_producer( tractor ); - mlt_properties props = mlt_tractor_properties( tractor ); + 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 ) ) ); + 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 );