Skip to content

Ladspa deduplicate #1269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddennedy merged 7 commits into from
Jul 13, 2026
Merged

Ladspa deduplicate #1269

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
22d87d7
Report duplicate service registration
bmatherly Jul 9, 2026
97b93b4
Avoid duplicate registration of ladspa filters
bmatherly Jul 9, 2026
239e242
Resolve review comments
bmatherly Jul 10, 2026
b138440
Build mltjackrack only when JACK is found
bmatherly Jul 11, 2026
56b7d67
Refactor jackrack build and factory
ddennedy Jul 12, 2026
01b1189
fix builds missing lv2 dependency
ddennedy Jul 13, 2026
0b7bd66
Merge branch 'master' into ladspa_deduplicate
ddennedy Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 29 additions & 31 deletions src/framework/mlt_repository.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,52 +230,50 @@ void mlt_repository_register(mlt_repository self,
const char *service,
mlt_register_callback symbol)
{
mlt_properties service_list = NULL;
const char *service_type_name = "unknown";

// Add the entry point to the corresponding service list
switch (service_type) {
case mlt_service_consumer_type:
mlt_properties_set_data(self->consumers,
service,
new_service(symbol),
0,
(mlt_destructor) mlt_properties_close,
NULL);
service_list = self->consumers;
service_type_name = "consumer";
break;
case mlt_service_filter_type:
mlt_properties_set_data(self->filters,
service,
new_service(symbol),
0,
(mlt_destructor) mlt_properties_close,
NULL);
service_list = self->filters;
service_type_name = "filter";
break;
case mlt_service_link_type:
mlt_properties_set_data(self->links,
service,
new_service(symbol),
0,
(mlt_destructor) mlt_properties_close,
NULL);
service_list = self->links;
service_type_name = "link";
break;
case mlt_service_producer_type:
mlt_properties_set_data(self->producers,
service,
new_service(symbol),
0,
(mlt_destructor) mlt_properties_close,
NULL);
service_list = self->producers;
service_type_name = "producer";
break;
case mlt_service_transition_type:
mlt_properties_set_data(self->transitions,
service,
new_service(symbol),
0,
(mlt_destructor) mlt_properties_close,
NULL);
service_list = self->transitions;
service_type_name = "transition";
break;
default:
mlt_log_error(NULL, "%s: Unable to register \"%s\"\n", __FUNCTION__, service);
break;
return;
}

if (mlt_properties_get_data(service_list, service, NULL)) {
mlt_log_error(NULL,
"%s: Duplicate %s registration for \"%s\"\n",
__FUNCTION__,
service_type_name,
service);
}
Comment thread
ddennedy marked this conversation as resolved.

mlt_properties_set_data(service_list,
service,
new_service(symbol),
0,
(mlt_destructor) mlt_properties_close,
NULL);
}

/** Get the repository properties for particular service class.
Expand Down
143 changes: 79 additions & 64 deletions src/modules/jackrack/factory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ extern mlt_producer producer_lv2_init(mlt_profile profile,
char *arg);
#endif

#ifdef WITH_VST2
#if defined(GPL) && defined(WITH_VST2)
Comment thread
ddennedy marked this conversation as resolved.
Outdated

#include "vestige.h"

Expand All @@ -105,10 +105,11 @@ plugin_mgr_t *g_jackrack_plugin_mgr = NULL;
lv2_mgr_t *g_lv2_plugin_mgr = NULL;
#endif

#ifdef WITH_VST2
#if defined(GPL) && defined(WITH_VST2)
vst2_mgr_t *g_vst2_plugin_mgr = NULL;
#endif

#if defined(mltladspa_EXPORTS) || (defined(mltjackrack_EXPORTS) && defined(WITH_JACK))
Comment thread
ddennedy marked this conversation as resolved.
Outdated
static void add_port_to_metadata(mlt_properties p, plugin_desc_t *desc, int j)
{
LADSPA_Data sample_rate = 48000;
Expand Down Expand Up @@ -153,9 +154,12 @@ static void add_port_to_metadata(mlt_properties p, plugin_desc_t *desc, int j)
mlt_properties_set(p, "mutable", "yes");
mlt_properties_set(p, "animation", "yes");
}
#endif

#endif

#if (defined(mltladspa_EXPORTS) && defined(GPL)) \
|| (defined(mltjackrack_EXPORTS) && defined(WITH_JACK))
static mlt_properties metadata(mlt_service_type type, const char *id, char *data)
{
char file[PATH_MAX];
Expand Down Expand Up @@ -287,6 +291,7 @@ static mlt_properties metadata(mlt_service_type type, const char *id, char *data

return result;
}
#endif

#ifdef WITH_LV2

Expand Down Expand Up @@ -507,7 +512,7 @@ static mlt_properties lv2_metadata(mlt_service_type type, const char *id, char *

#endif

#ifdef WITH_VST2
#if defined(GPL) && defined(WITH_VST2)

static void vst2_add_port_to_metadata(mlt_properties p, vst2_plugin_desc_t *desc, int j)
{
Expand Down Expand Up @@ -703,96 +708,106 @@ static mlt_properties vst2_metadata(mlt_service_type type, const char *id, char

JACKRACK_MODULE_EXPORT MLT_REPOSITORY
{
#ifdef GPL
GSList *list;
g_jackrack_plugin_mgr = plugin_mgr_new();

for (list = g_jackrack_plugin_mgr->all_plugins; list; list = g_slist_next(list)) {
plugin_desc_t *desc = (plugin_desc_t *) list->data;
char *s = malloc(strlen("ladpsa.") + 21);

sprintf(s, "ladspa.%lu", desc->id);
// Registrations owned by mltladspa.
#if defined(mltladspa_EXPORTS) && defined(GPL)
{
GSList *list;
g_jackrack_plugin_mgr = plugin_mgr_new();

for (list = g_jackrack_plugin_mgr->all_plugins; list; list = g_slist_next(list)) {
plugin_desc_t *desc = (plugin_desc_t *) list->data;
char *s = malloc(strlen("ladpsa.") + 21);

sprintf(s, "ladspa.%lu", desc->id);

if (desc->has_input) {
MLT_REGISTER(mlt_service_filter_type, s, filter_ladspa_init);
MLT_REGISTER_METADATA(mlt_service_filter_type, s, metadata, NULL);
} else {
MLT_REGISTER(mlt_service_producer_type, s, producer_ladspa_init);
MLT_REGISTER_METADATA(mlt_service_producer_type, s, metadata, NULL);
}

if (desc->has_input) {
MLT_REGISTER(mlt_service_filter_type, s, filter_ladspa_init);
MLT_REGISTER_METADATA(mlt_service_filter_type, s, metadata, NULL);
} else {
MLT_REGISTER(mlt_service_producer_type, s, producer_ladspa_init);
MLT_REGISTER_METADATA(mlt_service_producer_type, s, metadata, NULL);
free(s);
}

free(s);
mlt_factory_register_for_clean_up(g_jackrack_plugin_mgr,
(mlt_destructor) plugin_mgr_destroy);
}
mlt_factory_register_for_clean_up(g_jackrack_plugin_mgr, (mlt_destructor) plugin_mgr_destroy);
#endif

#ifdef WITH_LV2
g_lv2_plugin_mgr = lv2_mgr_new();
#if defined(mltladspa_EXPORTS) && defined(GPL) && defined(WITH_LV2)
{
GSList *list;
g_lv2_plugin_mgr = lv2_mgr_new();

char global_lv2_world[20];
snprintf(global_lv2_world, 20, "%p", g_lv2_plugin_mgr->lv2_world);
mlt_environment_set("global_lv2_world", global_lv2_world);
char global_lv2_world[20];
snprintf(global_lv2_world, 20, "%p", g_lv2_plugin_mgr->lv2_world);
mlt_environment_set("global_lv2_world", global_lv2_world);

for (list = g_lv2_plugin_mgr->all_plugins; list; list = g_slist_next(list)) {
lv2_plugin_desc_t *desc = (lv2_plugin_desc_t *) list->data;
char *s = NULL;
s = calloc(1, strlen("lv2.") + strlen(desc->uri) + 1);
for (list = g_lv2_plugin_mgr->all_plugins; list; list = g_slist_next(list)) {
lv2_plugin_desc_t *desc = (lv2_plugin_desc_t *) list->data;
char *s = NULL;
s = calloc(1, strlen("lv2.") + strlen(desc->uri) + 1);

sprintf(s, "lv2.%s", desc->uri);
sprintf(s, "lv2.%s", desc->uri);

char *str_ptr = strchr(s, ':');
while (str_ptr != NULL) {
*str_ptr++ = '^';
str_ptr = strchr(str_ptr, ':');
}
char *str_ptr = strchr(s, ':');
while (str_ptr != NULL) {
*str_ptr++ = '^';
str_ptr = strchr(str_ptr, ':');
}

if (desc->has_input) {
MLT_REGISTER(mlt_service_filter_type, s, filter_lv2_init);
MLT_REGISTER_METADATA(mlt_service_filter_type, s, lv2_metadata, NULL);
} else {
MLT_REGISTER(mlt_service_producer_type, s, producer_lv2_init);
MLT_REGISTER_METADATA(mlt_service_producer_type, s, lv2_metadata, NULL);
}
if (desc->has_input) {
MLT_REGISTER(mlt_service_filter_type, s, filter_lv2_init);
MLT_REGISTER_METADATA(mlt_service_filter_type, s, lv2_metadata, NULL);
} else {
MLT_REGISTER(mlt_service_producer_type, s, producer_lv2_init);
MLT_REGISTER_METADATA(mlt_service_producer_type, s, lv2_metadata, NULL);
}

if (s) {
free(s);
if (s) {
free(s);
}
}
}
#endif

#ifdef WITH_VST2
#if defined(mltladspa_EXPORTS) && defined(GPL) && defined(WITH_VST2)
{
GSList *list;
g_vst2_plugin_mgr = vst2_mgr_new();

g_vst2_plugin_mgr = vst2_mgr_new();
for (list = g_vst2_plugin_mgr->all_plugins; list; list = g_slist_next(list)) {
vst2_plugin_desc_t *desc = (vst2_plugin_desc_t *) list->data;
char *s = malloc(strlen("vst2.") + 21);

for (list = g_vst2_plugin_mgr->all_plugins; list; list = g_slist_next(list)) {
vst2_plugin_desc_t *desc = (vst2_plugin_desc_t *) list->data;
char *s = malloc(strlen("vst2.") + 21);
sprintf(s, "vst2.%lu", desc->id);

sprintf(s, "vst2.%lu", desc->id);
if (desc->has_input) {
MLT_REGISTER(mlt_service_filter_type, s, filter_vst2_init);
MLT_REGISTER_METADATA(mlt_service_filter_type, s, vst2_metadata, NULL);
} else {
MLT_REGISTER(mlt_service_producer_type, s, producer_vst2_init);
MLT_REGISTER_METADATA(mlt_service_producer_type, s, vst2_metadata, NULL);
}

if (desc->has_input) {
MLT_REGISTER(mlt_service_filter_type, s, filter_vst2_init);
MLT_REGISTER_METADATA(mlt_service_filter_type, s, vst2_metadata, NULL);
} else {
MLT_REGISTER(mlt_service_producer_type, s, producer_vst2_init);
MLT_REGISTER_METADATA(mlt_service_producer_type, s, vst2_metadata, NULL);
free(s);
}

free(s);
mlt_factory_register_for_clean_up(g_vst2_plugin_mgr, (mlt_destructor) vst2_mgr_destroy);
}
mlt_factory_register_for_clean_up(g_vst2_plugin_mgr, (mlt_destructor) vst2_mgr_destroy);

#endif

#ifdef WITH_JACK
// Registrations owned by mltjackrack.
#if defined(mltjackrack_EXPORTS) && defined(GPL) && defined(WITH_JACK)
MLT_REGISTER(mlt_service_filter_type, "jack", filter_jackrack_init);
MLT_REGISTER_METADATA(mlt_service_filter_type, "jack", metadata, "filter_jack.yml");
MLT_REGISTER(mlt_service_filter_type, "jackrack", filter_jackrack_init);
MLT_REGISTER_METADATA(mlt_service_filter_type, "jackrack", metadata, "filter_jackrack.yml");
#endif
MLT_REGISTER(mlt_service_filter_type, "ladspa", filter_ladspa_init);
MLT_REGISTER_METADATA(mlt_service_filter_type, "ladspa", metadata, "filter_ladspa.yml");
Comment thread
ddennedy marked this conversation as resolved.
Outdated
#endif
#ifdef WITH_JACK

#if defined(mltjackrack_EXPORTS) && defined(WITH_JACK)
MLT_REGISTER(mlt_service_consumer_type, "jack", consumer_jack_init);
MLT_REGISTER_METADATA(mlt_service_consumer_type, "jack", metadata, "consumer_jack.yml");
#endif
Expand Down
Loading