zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-01-19 07:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

No need for user created control nodes anymore

Browse source 
Control nodes are created automatically when effect is added now.
Also remove the now unused FLUID_LADSPA_FIXED direction.
This commit is contained in:
Marcus Weseloh 2017-10-28 00:11:54 +02:00
parent e0463843fa
commit 72517b8715
2 changed files with 4 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/bindings/fluid_ladspa.c
View file

@ -71,7 +71,6 @@ static int check_all_ports_connected(fluid_ladspa_plugin_t *plugin, const char *
static int check_no_inplace_broken(fluid_ladspa_plugin_t *plugin, const char **name1, const char **name2);
static int check_host_output_used(fluid_ladspa_fx_t *fx);
static int check_all_audio_nodes_connected(fluid_ladspa_fx_t *fx, const char **name);
static int check_all_control_nodes_connected(fluid_ladspa_fx_t *fx, const char **name);
static FLUID_INLINE void mix_plugin_with_host_buffer(fluid_ladspa_node_t *node,
int num_samples, float gain);
@ -266,8 +265,9 @@ int fluid_ladspa_set_sample_rate(fluid_ladspa_fx_t *fx, fluid_real_t sample_rate
* Check if the LADSPA engine is currently used to render audio
*
* If an engine is active, the only allowed user actions are deactivation or
* changing user control nodes. Anything else, especially adding or removing
* plugins, nodes or ports, is only allowed in deactivated state.
* setting values of control ports on effects. Anything else, especially
* adding or removing plugins, nodes or ports, is only allowed in deactivated
* state.
*
* @param fx LADSPA fx instance
* @return TRUE if LADSPA effects engine is active, otherwise FALSE
@ -661,35 +661,6 @@ int fluid_ladspa_add_audio_node(fluid_ladspa_fx_t *fx, const char *name)
LADSPA_API_RETURN(fx, FLUID_OK);
}
/**
* Create and add a new LADSPA control node that can be set manually.
*
* @param fx LADSPA effects instance
* @param name name of the new node
* @param val the initial float value of the node
* @return FLUID_OK on success, FLUID_FAILED on error
*/
int fluid_ladspa_add_control_node(fluid_ladspa_fx_t *fx, const char *name, fluid_real_t val)
{
fluid_ladspa_node_t *node;
LADSPA_API_ENTER(fx);
if (fluid_ladspa_is_active(fx))
{
LADSPA_API_RETURN(fx, FLUID_FAILED);
}
node = new_fluid_ladspa_node(fx, name, FLUID_LADSPA_NODE_CONTROL, NULL);
if (node == NULL)
{
LADSPA_API_RETURN(fx, FLUID_FAILED);
}
node->plugin_buffer[0] = val;
LADSPA_API_RETURN(fx, FLUID_OK);
}
/**
* Set the value of an effect control port
*
@ -935,12 +906,6 @@ int fluid_ladspa_check(fluid_ladspa_fx_t *fx, char *err, int err_size)
LADSPA_API_RETURN(fx, FLUID_FAILED);
}
if (check_all_control_nodes_connected(fx, &str) == FLUID_FAILED)
{
FLUID_SNPRINTF(err, err_size, "Control node '%s' is not connected\n", str);
LADSPA_API_RETURN(fx, FLUID_FAILED);
}
LADSPA_API_RETURN(fx, FLUID_OK);
}
@ -1560,7 +1525,7 @@ static void connect_node_to_port(fluid_ladspa_node_t *node, fluid_ladspa_dir_t d
plugin->port_nodes[port_idx] = node;
/* Mark node as connected in the respective direction */
if (dir == FLUID_LADSPA_INPUT || dir == FLUID_LADSPA_FIXED)
if (dir == FLUID_LADSPA_INPUT)
{
node->num_outputs++;
}
@ -1676,29 +1641,6 @@ static int check_all_audio_nodes_connected(fluid_ladspa_fx_t *fx, const char **n
return FLUID_OK;
}
/**
* Check that all user control nodes have an input or an output
*
* @param fx LADSPA fx instance
* @param name if check fails, points to the name of first failed node
* @return FLUID_OK on successful check, otherwise FLUID_FAILED
*/
static int check_all_control_nodes_connected(fluid_ladspa_fx_t *fx, const char **name)
{
int i;
for (i = 0; i < fx->num_nodes; i++)
{
if (fx->nodes[i]->type == FLUID_LADSPA_NODE_CONTROL &&
(fx->nodes[i]->num_outputs == 0) && (fx->nodes[i]->num_inputs == 0))
{
*name = fx->nodes[i]->name;
return FLUID_FAILED;
}
}
return FLUID_OK;
}
static FLUID_INLINE void mix_plugin_with_host_buffer(fluid_ladspa_node_t *node,
int num_samples, float gain)
{

2
src/bindings/fluid_ladspa.h
View file

@ -45,7 +45,6 @@ typedef enum _fluid_ladspa_state_t {
typedef enum _fluid_ladspa_dir_t {
FLUID_LADSPA_INPUT,
FLUID_LADSPA_OUTPUT,
FLUID_LADSPA_FIXED
} fluid_ladspa_dir_t;
@ -164,7 +163,6 @@ int fluid_ladspa_plugin_mode(fluid_ladspa_fx_t *fx, const char *name,
int fluid_ladspa_port_exists(fluid_ladspa_fx_t *fx, const char *plugin_name, const char *name);
int fluid_ladspa_add_audio_node(fluid_ladspa_fx_t *fx, const char *name);
int fluid_ladspa_add_control_node(fluid_ladspa_fx_t *fx, const char *name, fluid_real_t val);
int fluid_ladspa_set_control_port(fluid_ladspa_fx_t *fx, const char *effect_name,
const char *port_name, fluid_real_t val);
int fluid_ladspa_node_exists(fluid_ladspa_fx_t *fx, const char *name);