Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make settings more pleasing, natural and subtler #1287

Merged
merged 4 commits into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@ summary of contributions.
changes and bug fixes and got the synthesizer to actually work. Most
importantly, he used it on stage to make music.

* S. Christian Collins did much testing of FluidSynth in regards to
EMU10K1 compatibility and provided many synthesis fixes in that regard.
* S. Christian Collins provided many tests and fixes on EMU10K1
compatibility. He also supplied reference chorus and reverb settings for
developing the default ones.

* Alberto Salvia Novella developed the default chorus and reverb settings.

* Stephane Letz from Grame wrote most of the MidiShare driver, all of
the PortAudio driver, ported iiwusynth to MacOS X, and sent in many
Expand Down
17 changes: 9 additions & 8 deletions doc/fluidsettings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Developers:
<setting>
<name>chorus.depth</name>
<type>num</type>
<def>8.0</def>
<def>4.25 (since version 2.4.0),<br />8.0 (2.3.x and older)</def>
<min>0.0</min>
<max>256.0</max>
<realtime/>
Expand All @@ -57,7 +57,8 @@ Developers:
<setting>
<name>chorus.level</name>
<type>num</type>
<def>2.0</def>
<def>0.6 (since version 2.4.0),<br />2.0 (2.3.x and older)</def>
<def></def>
<min>0.0</min>
<max>10.0</max>
<realtime/>
Expand All @@ -77,7 +78,7 @@ Developers:
<setting>
<name>chorus.speed</name>
<type>num</type>
<def>0.3</def>
<def>0.2 (since version 2.4.0),<br />0.3 (2.3.x and older)</def>
<min>0.1</min>
<max>5.0</max>
<realtime/>
Expand Down Expand Up @@ -140,7 +141,7 @@ Developers:
<setting>
<name>gain</name>
<type>num</type>
<def>0.2</def>
<def>0.6 (since version 2.4.0),<br />0.2 (2.3.x and older)</def>
<min>0.0</min>
<max>10.0</max>
<realtime/>
Expand Down Expand Up @@ -312,7 +313,7 @@ Developers:
<setting>
<name>reverb.damp</name>
<type>num</type>
<def>0.0</def>
<def>0.3 (since version 2.4.0),<br />0.0 (2.3.x and older)</def>
<min>0.0</min>
<max>1.0</max>
<realtime/>
Expand All @@ -322,7 +323,7 @@ Developers:
<setting>
<name>reverb.level</name>
<type>num</type>
<def>0.9</def>
<def>0.7 (since version 2.4.0),<br />0.9 (2.3.x and older)</def>
<min>0.0</min>
<max>1.0</max>
<realtime/>
Expand All @@ -332,7 +333,7 @@ Developers:
<setting>
<name>reverb.room-size</name>
<type>num</type>
<def>0.2</def>
<def>0.5 (since version 2.4.0),<br />0.2 (2.3.x and older)</def>
<min>0.0</min>
<max>1.0</max>
<realtime/>
Expand All @@ -342,7 +343,7 @@ Developers:
<setting>
<name>reverb.width</name>
<type>num</type>
<def>0.5</def>
<def>0.8 (since version 2.4.0),<br />0.5 (2.3.x and older)</def>
<min>0.0</min>
<max>100.0</max>
<realtime/>
Expand Down
2 changes: 1 addition & 1 deletion src/synth/fluid_synth.c
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ void fluid_synth_settings(fluid_settings_t *settings)

fluid_settings_register_int(settings, "synth.polyphony", 256, 1, 65535, 0);
fluid_settings_register_int(settings, "synth.midi-channels", 16, 16, 256, 0);
fluid_settings_register_num(settings, "synth.gain", 0.2, 0.0, 10.0, 0);
fluid_settings_register_num(settings, "synth.gain", 0.6, 0.0, 10.0, 0);
fluid_settings_register_int(settings, "synth.audio-channels", 1, 1, 128, 0);
fluid_settings_register_int(settings, "synth.audio-groups", 1, 1, 128, 0);
fluid_settings_register_int(settings, "synth.effects-channels", 2, 2, 2, 0);
Expand Down
24 changes: 12 additions & 12 deletions src/synth/fluid_synth.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@
*
* DEFINES
*/
#define FLUID_NUM_PROGRAMS 128
#define DRUM_INST_BANK 128
#define FLUID_NUM_PROGRAMS 128
#define DRUM_INST_BANK 128

#define FLUID_UNSET_PROGRAM 128 /* Program number used to unset a preset */
#define FLUID_UNSET_PROGRAM 128 /* Program number used to unset a preset */

#define FLUID_REVERB_DEFAULT_ROOMSIZE 0.2f /**< Default reverb room size */
#define FLUID_REVERB_DEFAULT_DAMP 0.0f /**< Default reverb damping */
#define FLUID_REVERB_DEFAULT_WIDTH 0.5f /**< Default reverb width */
#define FLUID_REVERB_DEFAULT_LEVEL 0.9f /**< Default reverb level */
#define FLUID_REVERB_DEFAULT_DAMP 0.3f /**< Default reverb damping */
#define FLUID_REVERB_DEFAULT_LEVEL 0.7f /**< Default reverb level */
#define FLUID_REVERB_DEFAULT_ROOMSIZE 0.5f /**< Default reverb room size */
#define FLUID_REVERB_DEFAULT_WIDTH 0.8f /**< Default reverb width */

#define FLUID_CHORUS_DEFAULT_N 3 /**< Default chorus voice count */
#define FLUID_CHORUS_DEFAULT_LEVEL 2.0f /**< Default chorus level */
#define FLUID_CHORUS_DEFAULT_SPEED 0.3f /**< Default chorus speed */
#define FLUID_CHORUS_DEFAULT_DEPTH 8.0f /**< Default chorus depth */
#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE /**< Default chorus waveform type */
#define FLUID_CHORUS_DEFAULT_DEPTH 4.25f /**< Default chorus depth */
#define FLUID_CHORUS_DEFAULT_LEVEL 0.6f /**< Default chorus level */
#define FLUID_CHORUS_DEFAULT_N 3 /**< Default chorus voice count */
#define FLUID_CHORUS_DEFAULT_SPEED 0.2f /**< Default chorus speed */
#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE /**< Default chorus waveform type */

/***************************************************************
*
Expand Down
Loading