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

Move bookkeeping of nodes out of node creation function

Browse source 
Removal from and iterating through othe node lists is also handled
separately, so adding nodes to the lists should be explicit as well.
This commit is contained in:
Marcus Weseloh 2021-03-06 16:44:12 +01:00
parent 14b288a801
commit ef29d03cc9
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/bindings/fluid_ladspa.c
View file

@ -283,6 +283,7 @@ int fluid_ladspa_add_host_ports(fluid_ladspa_fx_t *fx, const char *prefix,
{ {
int i; int i;
char name[99]; char name[99];
fluid_ladspa_node_t *node;
LADSPA_API_ENTER(fx); LADSPA_API_ENTER(fx);
@ -304,12 +305,16 @@ int fluid_ladspa_add_host_ports(fluid_ladspa_fx_t *fx, const char *prefix,
FLUID_STRNCPY(name, prefix, sizeof(name)); FLUID_STRNCPY(name, prefix, sizeof(name));
} }
if(new_fluid_ladspa_node(fx, name, node = new_fluid_ladspa_node(fx, name,
FLUID_LADSPA_NODE_AUDIO | FLUID_LADSPA_NODE_HOST, FLUID_LADSPA_NODE_AUDIO | FLUID_LADSPA_NODE_HOST,
&buffers[i * buf_stride]) == NULL) &buffers[i * buf_stride]);
if (node == NULL)
{ {
LADSPA_API_RETURN(fx, FLUID_FAILED); LADSPA_API_RETURN(fx, FLUID_FAILED);
} }
fx->nodes = fluid_list_append(fx->nodes, node);
fx->host_nodes = fluid_list_append(fx->host_nodes, node);
} }
LADSPA_API_RETURN(fx, FLUID_OK); LADSPA_API_RETURN(fx, FLUID_OK);
@ -822,6 +827,9 @@ int fluid_ladspa_add_buffer(fluid_ladspa_fx_t *fx, const char *name)
LADSPA_API_RETURN(fx, FLUID_FAILED); LADSPA_API_RETURN(fx, FLUID_FAILED);
} }
fx->nodes = fluid_list_append(fx->nodes, node);
fx->audio_nodes = fluid_list_append(fx->audio_nodes, node);
LADSPA_API_RETURN(fx, FLUID_OK); LADSPA_API_RETURN(fx, FLUID_OK);
} }
@ -1397,19 +1405,6 @@ static fluid_ladspa_node_t *new_fluid_ladspa_node(fluid_ladspa_fx_t *fx, const c
FLUID_MEMSET(node->effect_buffer, 0, buffer_size * sizeof(LADSPA_Data)); FLUID_MEMSET(node->effect_buffer, 0, buffer_size * sizeof(LADSPA_Data));
} }
fx->nodes = fluid_list_append(fx->nodes, node);
/* Host and user audio nodes are also noted in separate lists to access them
* quickly during fluid_ladspa_run */
if((type & FLUID_LADSPA_NODE_AUDIO) && (type & FLUID_LADSPA_NODE_HOST))
{
fx->host_nodes = fluid_list_append(fx->host_nodes, node);
}
else if((type & FLUID_LADSPA_NODE_AUDIO) && (type & FLUID_LADSPA_NODE_USER))
{
fx->audio_nodes = fluid_list_append(fx->audio_nodes, node);
}
return node; return node;
} }
@ -1592,6 +1587,8 @@ static int create_control_port_nodes(fluid_ladspa_fx_t *fx, fluid_ladspa_effect_
return FLUID_FAILED; return FLUID_FAILED;
} }
fx->nodes = fluid_list_append(fx->nodes, node);
node->effect_buffer[0] = get_default_port_value(effect, i, fx->sample_rate); node->effect_buffer[0] = get_default_port_value(effect, i, fx->sample_rate);
dir = (LADSPA_IS_PORT_INPUT(port_flags)) ? FLUID_LADSPA_INPUT : FLUID_LADSPA_OUTPUT; dir = (LADSPA_IS_PORT_INPUT(port_flags)) ? FLUID_LADSPA_INPUT : FLUID_LADSPA_OUTPUT;