zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-02-22 11:51:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Experimental support for changing sample-rate

Browse source
This commit is contained in:
David Henningsson 2010-07-14 08:45:17 +00:00
parent 4b8b6f27b7
commit f62306d142
3 changed files with 47 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fluidsynth/include/fluidsynth/synth.h
View file

@ -177,6 +177,7 @@ FLUIDSYNTH_API int fluid_synth_count_effects_channels(fluid_synth_t* synth);
/* Synthesis parameters */
FLUIDSYNTH_API void fluid_synth_set_sample_rate(fluid_synth_t* synth, float sample_rate);
FLUIDSYNTH_API void fluid_synth_set_gain(fluid_synth_t* synth, float gain);
FLUIDSYNTH_API float fluid_synth_get_gain(fluid_synth_t* synth);
FLUIDSYNTH_API int fluid_synth_set_polyphony(fluid_synth_t* synth, int polyphony);

5
fluidsynth/src/drivers/fluid_jack.c
View file

@ -404,10 +404,9 @@ new_fluid_jack_audio_driver2(fluid_settings_t* settings, fluid_audio_func_t func
fluid_settings_getnum (settings, "synth.sample-rate", &sample_rate);
if ((int)sample_rate != jack_srate) {
/* There's currently no way to change the sampling rate of the
synthesizer after it's been created. */
FLUID_LOG(FLUID_WARN, "Jack sample rate mismatch, expect tuning issues"
FLUID_LOG(FLUID_WARN, "Jack sample rate mismatch, adjusting."
" (synth.sample-rate=%lu, jackd=%lu)", (int)sample_rate, jack_srate);
fluid_settings_setnum (settings, "synth.sample-rate", jack_srate);
}

49
fluidsynth/src/synth/fluid_synth.c
View file

@ -88,6 +88,8 @@ fluid_synth_get_preset_by_sfont_name(fluid_synth_t* synth, const char *sfontname
unsigned int banknum, unsigned int prognum);
static void fluid_synth_update_presets(fluid_synth_t* synth);
static int fluid_synth_update_sample_rate(fluid_synth_t* synth,
char* name, double value);
static int fluid_synth_update_gain(fluid_synth_t* synth,
char* name, double value);
static void fluid_synth_update_gain_LOCAL(fluid_synth_t* synth);
@ -565,10 +567,10 @@ new_fluid_synth(fluid_settings_t *settings)
fluid_settings_getint(settings, "synth.device-id", &synth->device_id);
fluid_settings_getint(settings, "synth.cpu-cores", &synth->cores);
fluid_settings_getint(settings, "synth.min-note-length", &i);
synth->min_note_length_ticks = (unsigned int) (i*synth->sample_rate/1000.0f);
/* register the callbacks */
fluid_settings_register_num(settings, "synth.sample-rate",
44100.0f, 22050.0f, 96000.0f, 0,
(fluid_num_update_t) fluid_synth_update_sample_rate, synth);
fluid_settings_register_num(settings, "synth.gain",
0.2f, 0.0f, 10.0f, 0,
(fluid_num_update_t) fluid_synth_update_gain, synth);
@ -646,8 +648,7 @@ new_fluid_synth(fluid_settings_t *settings)
nbuf, synth->effects_channels);
if (synth->eventhandler == NULL)
goto error_recovery;
/* allocate and add the default sfont loader */
loader = new_fluid_defsfloader();
@ -683,6 +684,8 @@ new_fluid_synth(fluid_settings_t *settings)
}
}
fluid_synth_set_sample_rate(synth, synth->sample_rate);
fluid_rvoice_eventhandler_push(synth->eventhandler,
fluid_rvoice_mixer_set_polyphony,
synth->eventhandler->mixer, synth->polyphony, 0.0f);
@ -2577,6 +2580,42 @@ fluid_synth_update_presets(fluid_synth_t* synth)
}
}
/* Handler for synth.gain setting. */
static int
fluid_synth_update_sample_rate(fluid_synth_t* synth, char* name, double value)
{
fluid_synth_set_sample_rate(synth, (float) value);
return 0;
}
/**
* Set sample rate of the synth.
* NOTE: This function is currently experimental and should only be
* used when no voices or notes are active, and before any rendering calls.
* @param synth FluidSynth instance
* @param sample_rate New sample rate (Hz)
* @since 1.1.2
*/
void
fluid_synth_set_sample_rate(fluid_synth_t* synth, float sample_rate)
{
int i;
fluid_return_if_fail (synth != NULL);
fluid_synth_api_enter(synth);
fluid_clip (sample_rate, 22500.0f, 96000.0f);
synth->sample_rate = sample_rate;
fluid_settings_getint(synth->settings, "synth.min-note-length", &i);
synth->min_note_length_ticks = (unsigned int) (i*synth->sample_rate/1000.0f);
fluid_rvoice_eventhandler_push(synth->eventhandler,
fluid_rvoice_mixer_set_samplerate,
synth->eventhandler->mixer,
0, sample_rate);
fluid_synth_api_exit(synth);
}
/* Handler for synth.gain setting. */
static int
fluid_synth_update_gain(fluid_synth_t* synth, char* name, double value)