X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffactory.c;h=7adb8fcc6385592035ae7afe0b166643aa787208;hb=7d8e0015a1a12a8ec671b9316a30aa78fb0b53be;hp=5cb4550400851783d3a7631ed173d7a65ac9de9d;hpb=9bb7dd62a48fa3d084a4b43b576aed086654b524;p=mlt diff --git a/src/modules/core/factory.c b/src/modules/core/factory.c index 5cb45504..7adb8fcc 100644 --- a/src/modules/core/factory.c +++ b/src/modules/core/factory.c @@ -22,6 +22,7 @@ #include #include +extern mlt_consumer consumer_multi_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_consumer consumer_null_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_filter filter_audiochannels_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_filter filter_audioconvert_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); @@ -31,6 +32,7 @@ extern mlt_filter filter_channelcopy_init( mlt_profile profile, mlt_service_type extern mlt_filter filter_crop_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_filter filter_data_feed_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_filter filter_data_show_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); +extern mlt_filter filter_fieldorder_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_filter filter_gamma_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_filter filter_greyscale_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_filter filter_imageconvert_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); @@ -46,8 +48,10 @@ extern mlt_filter filter_transition_init( mlt_profile profile, mlt_service_type extern mlt_filter filter_watermark_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_producer producer_colour_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_producer producer_consumer_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); -extern mlt_producer producer_loader_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_producer producer_hold_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); +extern mlt_producer producer_loader_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); +extern mlt_producer producer_melt_file_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); +extern mlt_producer producer_melt_init( mlt_profile profile, mlt_service_type type, const char *id, char **argv ); extern mlt_producer producer_noise_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_producer producer_ppm_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); #include "transition_composite.h" @@ -58,43 +62,24 @@ extern mlt_transition transition_mix_init( mlt_profile profile, mlt_service_type static mlt_properties metadata( mlt_service_type type, const char *id, void *data ) { char file[ PATH_MAX ]; - const char *service_type = NULL; - switch ( type ) - { - case filter_type: - service_type = "filter"; - break; - case producer_type: - service_type = "producer"; - break; - case transition_type: - service_type = "transition"; - break; - default: - return NULL; - } - if ( !strcmp( id, "grayscale" ) ) - id = "greyscale"; - else if ( !strcmp( id, "color" ) ) - id = "colour"; - else if ( !strcmp( id, "channelswap" ) ) - id = "channelcopy"; - snprintf( file, PATH_MAX, "%s/core/%s_%s.yml", mlt_environment( "MLT_DATA" ), service_type, id ); + snprintf( file, PATH_MAX, "%s/core/%s", mlt_environment( "MLT_DATA" ), (char*) data ); return mlt_properties_parse_yaml( file ); } MLT_REPOSITORY { + MLT_REGISTER( consumer_type, "multi", consumer_multi_init ); MLT_REGISTER( consumer_type, "null", consumer_null_init ); MLT_REGISTER( filter_type, "audiochannels", filter_audiochannels_init ); MLT_REGISTER( filter_type, "audioconvert", filter_audioconvert_init ); MLT_REGISTER( filter_type, "audiowave", filter_audiowave_init ); MLT_REGISTER( filter_type, "brightness", filter_brightness_init ); MLT_REGISTER( filter_type, "channelcopy", filter_channelcopy_init ); - MLT_REGISTER( filter_type, "channelswap", filter_channelcopy_init ); - MLT_REGISTER( filter_type, "crop", filter_crop_init ); + MLT_REGISTER( filter_type, "channelswap", filter_channelcopy_init ); + MLT_REGISTER( filter_type, "crop", filter_crop_init ); MLT_REGISTER( filter_type, "data_feed", filter_data_feed_init ); MLT_REGISTER( filter_type, "data_show", filter_data_show_init ); + MLT_REGISTER( filter_type, "fieldorder", filter_fieldorder_init ); MLT_REGISTER( filter_type, "gamma", filter_gamma_init ); MLT_REGISTER( filter_type, "greyscale", filter_greyscale_init ); MLT_REGISTER( filter_type, "grayscale", filter_greyscale_init ); @@ -113,8 +98,10 @@ MLT_REPOSITORY MLT_REGISTER( producer_type, "color", producer_colour_init ); MLT_REGISTER( producer_type, "colour", producer_colour_init ); MLT_REGISTER( producer_type, "consumer", producer_consumer_init ); - MLT_REGISTER( producer_type, "loader", producer_loader_init ); MLT_REGISTER( producer_type, "hold", producer_hold_init ); + MLT_REGISTER( producer_type, "loader", producer_loader_init ); + MLT_REGISTER( producer_type, "melt", producer_melt_init ); + MLT_REGISTER( producer_type, "melt_file", producer_melt_file_init ); MLT_REGISTER( producer_type, "noise", producer_noise_init ); MLT_REGISTER( producer_type, "ppm", producer_ppm_init ); MLT_REGISTER( transition_type, "composite", transition_composite_init ); @@ -122,29 +109,36 @@ MLT_REPOSITORY MLT_REGISTER( transition_type, "mix", transition_mix_init ); MLT_REGISTER( transition_type, "region", transition_region_init ); - MLT_REGISTER_METADATA( filter_type, "audiowave", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "brightness", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "channelcopy", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "channelswap", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "crop", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "data_show", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "gamma", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "greyscale", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "grayscale", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "luma", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "mirror", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "mono", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "obscure", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "region", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "transition", metadata, NULL ); - MLT_REGISTER_METADATA( filter_type, "watermark", metadata, NULL ); - MLT_REGISTER_METADATA( producer_type, "colour", metadata, NULL ); - MLT_REGISTER_METADATA( producer_type, "color", metadata, NULL ); - MLT_REGISTER_METADATA( producer_type, "consumer", metadata, NULL ); - MLT_REGISTER_METADATA( producer_type, "hold", metadata, NULL ); - MLT_REGISTER_METADATA( producer_type, "noise", metadata, NULL ); - MLT_REGISTER_METADATA( transition_type, "composite", metadata, NULL ); - MLT_REGISTER_METADATA( transition_type, "luma", metadata, NULL ); - MLT_REGISTER_METADATA( transition_type, "mix", metadata, NULL ); - MLT_REGISTER_METADATA( transition_type, "region", metadata, NULL ); + MLT_REGISTER_METADATA( consumer_type, "multi", metadata, "consumer_multi.yml" ); + MLT_REGISTER_METADATA( filter_type, "audiowave", metadata, "filter_audiowave.yml" ); + MLT_REGISTER_METADATA( filter_type, "brightness", metadata, "filter_brightness.yml" ); + MLT_REGISTER_METADATA( filter_type, "channelcopy", metadata, "filter_channelcopy.yml" ); + MLT_REGISTER_METADATA( filter_type, "channelswap", metadata, "filter_channelcopy.yml" ); + MLT_REGISTER_METADATA( filter_type, "crop", metadata, "filter_crop.yml" ); + MLT_REGISTER_METADATA( filter_type, "data_show", metadata, "filter_data_show.yml" ); + MLT_REGISTER_METADATA( filter_type, "fieldorder", metadata, "filter_fieldorder.yml" ); + MLT_REGISTER_METADATA( filter_type, "gamma", metadata, "filter_gamma.yml" ); + MLT_REGISTER_METADATA( filter_type, "greyscale", metadata, "filter_greyscale.yml" ); + MLT_REGISTER_METADATA( filter_type, "grayscale", metadata, "filter_greyscale.yml" ); + MLT_REGISTER_METADATA( filter_type, "luma", metadata, "filter_luma.yml" ); + MLT_REGISTER_METADATA( filter_type, "mirror", metadata, "filter_mirror.yml" ); + MLT_REGISTER_METADATA( filter_type, "mono", metadata, "filter_mono.yml" ); + MLT_REGISTER_METADATA( filter_type, "obscure", metadata, "filter_obscure.yml" ); + MLT_REGISTER_METADATA( filter_type, "region", metadata, "filter_region.yml" ); + MLT_REGISTER_METADATA( filter_type, "rescale", metadata, "filter_rescale.yml" ); + MLT_REGISTER_METADATA( filter_type, "resize", metadata, "filter_resize.yml" ); + MLT_REGISTER_METADATA( filter_type, "transition", metadata, "filter_transition.yml" ); + MLT_REGISTER_METADATA( filter_type, "watermark", metadata, "filter_watermark.yml" ); + MLT_REGISTER_METADATA( producer_type, "colour", metadata, "producer_colour.yml" ); + MLT_REGISTER_METADATA( producer_type, "color", metadata, "producer_colour.yml" ); + MLT_REGISTER_METADATA( producer_type, "consumer", metadata, "producer_consumer.yml" ); + MLT_REGISTER_METADATA( producer_type, "hold", metadata, "producer_hold.yml" ); + MLT_REGISTER_METADATA( producer_type, "loader", metadata, "producer_loader.yml" ); + MLT_REGISTER_METADATA( producer_type, "melt", metadata, "producer_melt.yml" ); + MLT_REGISTER_METADATA( producer_type, "melt_file", metadata, "producer_melt_file.yml" ); + MLT_REGISTER_METADATA( producer_type, "noise", metadata, "producer_noise.yml" ); + MLT_REGISTER_METADATA( transition_type, "composite", metadata, "transition_composite.yml" ); + MLT_REGISTER_METADATA( transition_type, "luma", metadata, "transition_luma.yml" ); + MLT_REGISTER_METADATA( transition_type, "mix", metadata, "transition_mix.yml" ); + MLT_REGISTER_METADATA( transition_type, "region", metadata, "transition_region.yml" ); }