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

split reset mapping API. This lead in 2 APIs

Browse source 
- fluid_synth_mixer_reset_channel_mapping()
-fluid_synth_mixer_reset_fx_mapping()
This commit is contained in:
jjceresa 2020-09-16 16:02:36 +02:00
parent b6c82df6fc
commit bfbf65555b
3 changed files with 59 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/fluidsynth/synth.h
View file

@ -392,16 +392,17 @@ FLUIDSYNTH_API int fluid_synth_get_breath_mode(fluid_synth_t *synth,
/* API: Mixer MIDI channels mapping */
FLUIDSYNTH_API int fluid_synth_mixer_get_channel_mapping(fluid_synth_t *synth,
int chan, int *out_from_chan, int *fx_from_chan);
FLUIDSYNTH_API int fluid_synth_mixer_get_fx_mapping(fluid_synth_t *synth,
int fxunit_idx, int *out_idx);
FLUIDSYNTH_API int fluid_synth_mixer_set_chan_to_out_mapping(fluid_synth_t *synth,
int chan, int out_idx);
FLUIDSYNTH_API int fluid_synth_mixer_set_chan_to_fx_mapping(fluid_synth_t *synth,
int chan, int fxunit_idx);
FLUIDSYNTH_API int fluid_synth_mixer_reset_channel_mapping(fluid_synth_t *synth, int chan);
FLUIDSYNTH_API int fluid_synth_mixer_get_fx_mapping(fluid_synth_t *synth,
int fxunit_idx, int *out_idx);
FLUIDSYNTH_API int fluid_synth_mixer_set_fx_to_out_mapping(fluid_synth_t *synth,
int fxunit_idx, int out_idx);
FLUIDSYNTH_API int fluid_synth_mixer_reset_mapping(fluid_synth_t *synth, int chan);
#ifdef __cplusplus
}

4
src/bindings/fluid_cmd.c
View file

@ -3545,7 +3545,7 @@ int fluid_handle_resetchanmap(void *data, int ac, char **av,
for(i = 0; i < ac; i++)
{
int chan = atoi(av[i]);
int result = fluid_synth_mixer_reset_mapping (synth, chan);
int result = fluid_synth_mixer_reset_channel_mapping (synth, chan);
if(result == FLUID_FAILED)
{
@ -3557,7 +3557,7 @@ int fluid_handle_resetchanmap(void *data, int ac, char **av,
else
{
/* set default mapping for all channels */
fluid_synth_mixer_reset_mapping(synth, -1);
fluid_synth_mixer_reset_channel_mapping(synth, -1);
}
/* prints result */

77
src/synth/fluid_synth.c
View file

@ -7579,23 +7579,10 @@ fluid_synth_mixer_set_fx_to_out_mapping(fluid_synth_t *synth,
/**
* Set mixer MIDI channel default mapping to audio buffers.
* The default mapping are:
* (1) default MIDI channel mapping to audio dry buffers.
* (2) default MIDI channel mapping to fx unit input .
* (3) default unit fx output mapping to audio dry buffers.
*
* The function allows to set default mapping (1)(2) and (3)
* for channel chan.
* 1) set default mapping between MIDI channel chan and audio dry
* output index out_from_chan:
* out_from_chan = chan % synth.audio-groups.
*
* 2) set default mapping between MIDI channel chan and
* fx unit input index fx_from_chan:
* fx_from_chan = chan % synth.effects-groups.
*
* 3) set default mapping between fx unit fxunit_idx (which is mapped to chan)
* and audio dry output index out_from_fx:
* out_from_fx = fxunit_idx % synth.audio-groups.
* (1) default MIDI channel mapping to audio dry buffer at index out_idx.
* out_idx = chan % synth.audio-groups
* (2) default MIDI channel mapping to fx unit input at index fxunit_idx.
* fx_unit_idx = chan % synth.effects-groups.
*
* @param synth FluidSynth instance.
* @param chan, MIDI channel to set default mapping to.
@ -7605,7 +7592,7 @@ fluid_synth_mixer_set_fx_to_out_mapping(fluid_synth_t *synth,
* @return #FLUID_OK on success, #FLUID_FAILED otherwise
*/
int
fluid_synth_mixer_reset_mapping(fluid_synth_t *synth, int chan)
fluid_synth_mixer_reset_channel_mapping(fluid_synth_t *synth, int chan)
{
int nbr_chan;
@ -7633,18 +7620,60 @@ fluid_synth_mixer_reset_mapping(fluid_synth_t *synth, int chan)
/* now set the default mapping */
for(; chan < nbr_chan; chan++)
{
int fxunit_idx = chan % synth->effects_groups;
/* set default mapping between MIDI channel chan and audio dry
output index */
synth->channel[chan]->mapping_to_out = chan % synth->audio_groups;
/* set default mapping between MIDI channel chan and fx unit input index */
synth->channel[chan]->mapping_to_fx = fxunit_idx;
synth->channel[chan]->mapping_to_fx = chan % synth->effects_groups;
}
/* set default mapping between fxunit_idx (which is mapped to chan)
and audio dry output index.
*/
FLUID_API_RETURN(FLUID_OK);
}
/**
* Set mixer fx unit default mapping to audio buffers.
* The default mapping between fx unit fxunit_idx and
* audio dry output index out_idx is:
* out_idx = fxunit_idx % synth.audio-groups.
*
* @param synth FluidSynth instance.
* @param fxunit_idx, index of fx unit to reset to default mapping.
* Must be in the range (-1 to synth.effects-groups-1).
* If -1, all fx units are set to default mapping.
*
* @return #FLUID_OK on success, #FLUID_FAILED otherwise
*/
int
fluid_synth_mixer_reset_fx_mapping(fluid_synth_t *synth, int fxunit_idx)
{
int nbr_fxunit;
fluid_return_val_if_fail(synth != NULL, FLUID_FAILED);
fluid_synth_api_enter(synth);
/* check parameters first */
if(fxunit_idx < 0)
{
/* The range is all fx unit from 0 to fx unit count -1 */
fxunit_idx = 0; /* beginning fx unit */
nbr_fxunit = synth->effects_groups; /* fx unit count */
}
else
{
if(fxunit_idx >= synth->effects_groups)
{
FLUID_API_RETURN(FLUID_FAILED);
}
/* The range is only chan */
nbr_fxunit = fxunit_idx + 1;
}
/* now set the default mapping */
for(; fxunit_idx < nbr_fxunit; fxunit_idx++)
{
/* set default mapping between fxunit_idx and audio dry output index. */
fluid_rvoice_mixer_set_fx_out_mapping(synth->eventhandler->mixer,
fxunit_idx,
fxunit_idx % synth->audio_groups);