zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-13 00:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Explicity create left and right host buffers

Browse source 
Makes it possible to create a single host buffer node for the
effect sends.
This commit is contained in:
Marcus Weseloh 2017-11-04 15:50:16 +01:00
parent 4b2414761b
commit 87c37f305d
3 changed files with 29 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/bindings/fluid_ladspa.c
View file

@ -273,20 +273,20 @@ void delete_fluid_ladspa_fx(fluid_ladspa_fx_t *fx)
/**
* Add host buffers to the LADSPA engine.
*
* @note The size of the buffers pointed to by the buffers array must be
* at least as large as the buffer size given to new_fluid_ladspa_fx.
*
* @param fx LADSPA fx instance
* @param prefix common name prefix for the created nodes
* @param num_buffers count of buffers in the left and right arrays
* @param left array of pointers to left side buffers
* @param right array of pointers to right side buffers
* @param num_buffers number of of buffers buffer array
* @param buffers array of pointers to buffers
* @return FLUID_OK on success, otherwise FLUID_FAILED
*/
int fluid_ladspa_add_host_ports(fluid_ladspa_fx_t *fx, const char *prefix,
int buffer_count, int buffer_size, fluid_real_t *left[], fluid_real_t *right[])
int buffer_count, fluid_real_t *buffers[])
{
int i, c;
int i;
char name[99];
char *side;
fluid_real_t **bufs;
LADSPA_API_ENTER(fx);
@ -295,37 +295,23 @@ int fluid_ladspa_add_host_ports(fluid_ladspa_fx_t *fx, const char *prefix,
LADSPA_API_RETURN(fx, FLUID_FAILED);
}
/* Create left and right nodes for all channels */
for (c = 0; c < buffer_count; c++)
/* Create nodes for all channels */
for (i = 0; i < buffer_count; i++)
{
for (i = 0; i < 2; i++)
/* If there is more than one buffer, then append a 1-based index to each node name */
if (buffer_count > 1) {
FLUID_SNPRINTF(name, sizeof(name), "%s%d", prefix, (i + 1));
}
else
{
if (i == 0)
{
side = "L";
bufs = left;
}
else
{
side = "R";
bufs = right;
}
FLUID_STRNCPY(name, prefix, sizeof(name));
}
/* If there is more than one channel, then append a 1-based index to each name */
if (buffer_count > 1) {
FLUID_SNPRINTF(name, sizeof(name), "%s%d:%s", prefix, (i + 1), side);
}
else
{
FLUID_SNPRINTF(name, sizeof(name), "%s:%s", prefix, side);
}
if (new_fluid_ladspa_node(fx, name,
FLUID_LADSPA_NODE_AUDIO | FLUID_LADSPA_NODE_HOST,
bufs[c]) == NULL)
{
return FLUID_FAILED;
}
if (new_fluid_ladspa_node(fx, name,
FLUID_LADSPA_NODE_AUDIO | FLUID_LADSPA_NODE_HOST,
buffers[i]) == NULL)
{
return FLUID_FAILED;
}
}

2
src/bindings/fluid_ladspa.h
View file

@ -45,7 +45,7 @@ int fluid_ladspa_reset(fluid_ladspa_fx_t *fx);
int fluid_ladspa_check(fluid_ladspa_fx_t *fx, char *err, int err_size);
int fluid_ladspa_add_host_ports(fluid_ladspa_fx_t *fx, const char *prefix,
int buffer_count, int buffer_size, fluid_real_t *left[], fluid_real_t *right[]);
int buffer_count, fluid_real_t *buffers[]);
int fluid_ladspa_host_port_exists(fluid_ladspa_fx_t *fx, const char *name);
int fluid_ladspa_add_buffer(fluid_ladspa_fx_t *fx, const char *name);

18
src/rvoice/fluid_rvoice_mixer.c
View file

@ -631,27 +631,23 @@ void delete_fluid_rvoice_mixer(fluid_rvoice_mixer_t* mixer)
void fluid_rvoice_mixer_set_ladspa(fluid_rvoice_mixer_t* mixer,
fluid_ladspa_fx_t *ladspa_fx, int audio_groups)
{
int buffer_size;
mixer->ladspa_fx = ladspa_fx;
if (ladspa_fx == NULL)
{
return;
}
buffer_size = mixer->buffers.buf_blocks * FLUID_BUFSIZE;
fluid_ladspa_add_host_ports(ladspa_fx, "Main:L", audio_groups,
mixer->buffers.left_buf);
fluid_ladspa_add_host_ports(ladspa_fx, "Main", audio_groups, buffer_size,
mixer->buffers.left_buf,
fluid_ladspa_add_host_ports(ladspa_fx, "Main:R", audio_groups,
mixer->buffers.right_buf);
fluid_ladspa_add_host_ports(ladspa_fx, "Reverb", 1, buffer_size,
&mixer->buffers.fx_left_buf[SYNTH_REVERB_CHANNEL],
&mixer->buffers.fx_right_buf[SYNTH_REVERB_CHANNEL]);
fluid_ladspa_add_host_ports(ladspa_fx, "Reverb:Send", 1,
&mixer->buffers.fx_left_buf[SYNTH_REVERB_CHANNEL]);
fluid_ladspa_add_host_ports(ladspa_fx, "Chorus", 1, buffer_size,
&mixer->buffers.fx_left_buf[SYNTH_REVERB_CHANNEL],
&mixer->buffers.fx_right_buf[SYNTH_REVERB_CHANNEL]);
fluid_ladspa_add_host_ports(ladspa_fx, "Chorus:Send", 1,
&mixer->buffers.fx_left_buf[SYNTH_REVERB_CHANNEL]);
}
#endif