zdoom
/
fluidsynth
mirror of https://github.com/ZDoom/fluidsynth.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'recent-docs'

This commit is contained in:
derselbst 2018-10-06 11:45:18 +02:00
parent 6f8a574e36 3d528a0f05
commit 3ef6af5ade
4 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/fluidsettings.xml
View File

@ -47,7 +47,7 @@ Developers: Settings can be deprecated by adding: <deprecated>SOME TEXT</depreca
<type>num</type>
<def>8</def>
<min>0</min>
<max>21</max>
<max>256</max>
<desc>
Specifies the modulation depth of the chorus.</desc>
</setting>
@ -331,7 +331,7 @@ Developers: Settings can be deprecated by adding: <deprecated>SOME TEXT</depreca
<name>sample-rate</name>
<type>num</type>
<def>44100.0</def>
<min>22050.0</min>
<min>8000.0</min>
<max>96000.0</max>
<desc>
The sample rate of the audio generated by the synthesizer.
@ -584,7 +584,7 @@ Developers: Settings can be deprecated by adding: <deprecated>SOME TEXT</depreca
<type>bool</type>
<def>0 (FALSE)</def>
<desc>
If 1 (TRUE), automatically connects FluidSynth to available MIDI input ports. alsa_seq is currently the only driver making use of this.
If 1 (TRUE), automatically connects FluidSynth to available MIDI input ports. alsa_seq and coremidi are currently the only drivers making use of this.
</desc>
</setting>
<setting>

23
doc/fluidsynth.1
View File

@ -200,39 +200,36 @@ Choose interpolation method for one channel
.TP
.B REVERB
.TP
.B reverb [0|1|on|off]
.B set synth.reverb.active [0|1|on|off]
Turn the reverb on or off
.TP
.B rev_preset num
Load preset num into the reverb unit
.TP
.B rev_setroomsize num
.B set synth.reverb.room-size num
Change reverb room size
.TP
.B rev_setdamp num
.B set synth.reverb.damp num
Change reverb damping
.TP
.B rev_setwidth num
.B set synth.reverb.width num
Change reverb width
.TP
.B rev_setlevel num
.B set synth.reverb.level num
Change reverb level
.TP
.B CHORUS
.TP
.B chorus [0|1|on|off]
.B set synth.chorus.active [0|1|on|off]
Turn the chorus on or off
.TP
.B cho_set_nr n
.B set synth.chorus.nr n
Use n delay lines (default 3)
.TP
.B cho_set_level num
.B set synth.chorus.level num
Set output level of each chorus line to num
.TP
.B cho_set_speed num
.B set synth.chorus.speed num
Set mod speed of chorus to num (Hz)
.TP
.B cho_set_depth num
.B set synth.chorus.depth num
Set chorus modulation depth to num (ms)
.TP
.B MIDI ROUTER

4
src/rvoice/fluid_chorus.c
View File

@ -90,8 +90,8 @@
* Set through MAX_SAMPLES_LN2.
* For example:
* MAX_SAMPLES_LN2=12
* => MAX_SAMPLES=pow(2,12)=4096
* => MAX_SAMPLES_ANDMASK=4095
* => MAX_SAMPLES=pow(2,12-1)=2048
* => MAX_SAMPLES_ANDMASK=2047
*/
#define MAX_SAMPLES_LN2 12

5
src/synth/fluid_synth.c
View File

@ -207,7 +207,7 @@ void fluid_synth_settings(fluid_settings_t *settings)
fluid_settings_register_int(settings, "synth.chorus.nr", FLUID_CHORUS_DEFAULT_N, 0, 99, 0);
fluid_settings_register_num(settings, "synth.chorus.level", FLUID_CHORUS_DEFAULT_LEVEL, 0.0f, 10.0f, 0);
fluid_settings_register_num(settings, "synth.chorus.speed", FLUID_CHORUS_DEFAULT_SPEED, 0.29f, 5.0f, 0);
fluid_settings_register_num(settings, "synth.chorus.depth", FLUID_CHORUS_DEFAULT_DEPTH, 0.0f, 21.0f, 0);
fluid_settings_register_num(settings, "synth.chorus.depth", FLUID_CHORUS_DEFAULT_DEPTH, 0.0f, 256.0f, 0);
fluid_settings_register_int(settings, "synth.ladspa.active", 0, 0, 1, FLUID_HINT_TOGGLED);
fluid_settings_register_int(settings, "synth.lock-memory", 1, 0, 1, FLUID_HINT_TOGGLED);
@ -3004,8 +3004,7 @@ fluid_synth_handle_sample_rate(void *data, const char *name, double value)
/**
* 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.
* @note This function should only be used when no voices or notes are active.
* @param synth FluidSynth instance
* @param sample_rate New sample rate (Hz)
* @since 1.1.2