zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-12-03 17:42:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Linking effect ports is only supported for audio ports

Browse source 
Clarify the code and error messages to reflect that
limitation / design decision.
This commit is contained in:
Marcus Weseloh 2021-03-06 16:26:10 +01:00
parent f66a7e1442
commit 14b288a801
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/bindings/fluid_ladspa.c
View file

@ -931,11 +931,11 @@ int fluid_ladspa_add_effect(fluid_ladspa_fx_t *fx, const char *effect_name,
} }
/** /**
* Connect an effect port to a host port or buffer * Connect an effect audio port to a host port or buffer
* *
* @param fx LADSPA effects instance * @param fx LADSPA effects instance
* @param effect_name name of the effect * @param effect_name name of the effect
* @param port_name the port name to connect to (case-insensitive prefix match) * @param port_name the audio port name to connect to (case-insensitive prefix match)
* @param name the host port or buffer to connect to (case-insensitive) * @param name the host port or buffer to connect to (case-insensitive)
* @return FLUID_OK on success, otherwise FLUID_FAILED * @return FLUID_OK on success, otherwise FLUID_FAILED
* *
@ -979,27 +979,25 @@ int fluid_ladspa_effect_link(fluid_ladspa_fx_t *fx, const char *effect_name,
LADSPA_API_RETURN(fx, FLUID_FAILED); LADSPA_API_RETURN(fx, FLUID_FAILED);
} }
port_flags = effect->desc->PortDescriptors[port_idx];
if(!LADSPA_IS_PORT_AUDIO(port_flags))
{
FLUID_LOG(FLUID_ERR, "Only audio effect ports can be linked to buffers or host ports");
LADSPA_API_RETURN(fx, FLUID_FAILED);
}
node = get_node(fx, name); node = get_node(fx, name);
if(node == NULL) if(node == NULL)
{ {
FLUID_LOG(FLUID_ERR, "Node '%s' not found", name); FLUID_LOG(FLUID_ERR, "Link target '%s' not found", name);
LADSPA_API_RETURN(fx, FLUID_FAILED); LADSPA_API_RETURN(fx, FLUID_FAILED);
} }
port_flags = effect->desc->PortDescriptors[port_idx]; if(!(node->type & FLUID_LADSPA_NODE_AUDIO))
/* Check that requested port type matches the node type */
if(LADSPA_IS_PORT_CONTROL(port_flags) && !(node->type & FLUID_LADSPA_NODE_CONTROL))
{ {
FLUID_LOG(FLUID_ERR, "Control port '%s' on effect '%s' can only connect to " FLUID_LOG(FLUID_ERR, "Link target '%s' needs to be an audio port or buffer", name);
"other control ports", port_name, effect_name);
LADSPA_API_RETURN(fx, FLUID_FAILED);
}
else if(LADSPA_IS_PORT_AUDIO(port_flags) && !(node->type & FLUID_LADSPA_NODE_AUDIO))
{
FLUID_LOG(FLUID_ERR, "Audio port '%s' on effect '%s' can only connect to"
"other audio port or buffer", port_name, effect_name);
LADSPA_API_RETURN(fx, FLUID_FAILED); LADSPA_API_RETURN(fx, FLUID_FAILED);
} }