From 681f81211f25c4c9fc163e0ec4d005f796da547d Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Thu, 27 Dec 2012 15:08:54 +0100 Subject: FLUIDSYNTH: Add separate dialog for FluidSynth settings I don't really understand what these parameters do, or what the sensible values are, so for now the sliders are limited only by the allowed (or, in one case, "safe") values. --- base/commandLine.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'base') diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 44007c494a..b87ec4453f 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -239,6 +239,24 @@ void registerDefaults() { ConfMan.registerDefault("gui_saveload_chooser", "grid"); ConfMan.registerDefault("gui_saveload_last_pos", "0"); + +#ifdef USE_FLUIDSYNTH + // FluidSynth settings. All multiplied by 100, except reverb width + // which is multiplied by 10, and chorus number which is an integer + // to begin with. + ConfMan.registerDefault("fluidsynth_chorus_nr", 3); + ConfMan.registerDefault("fluidsynth_chorus_level", 200); + ConfMan.registerDefault("fluidsynth_chorus_speed", 30); + ConfMan.registerDefault("fluidsynth_chorus_depth", 800); + ConfMan.registerDefault("fluidsynth_chorus_waveform", "sine"); + + ConfMan.registerDefault("fluidsynth_reverb_roomsize", 20); + ConfMan.registerDefault("fluidsynth_reverb_damping", 0); + ConfMan.registerDefault("fluidsynth_reverb_width", 5); + ConfMan.registerDefault("fluidsynth_reverb_level", 90); + + ConfMan.registerDefault("fluidsynth_misc_interpolation", "4th"); +#endif } // -- cgit v1.2.3 From a188a43da6a8d71a8d317b3c1f404088ce608336 Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Thu, 27 Dec 2012 21:43:33 +0100 Subject: GUI: Make the FluidSynth settings dialog a bit more like Qsynth To help people familiar with Qsynth (I'm not, but it seems to be one of the more polished FluidSynth front ends), use the same presentation and terminology for the FluidSynth settings. More to follow. --- base/commandLine.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'base') diff --git a/base/commandLine.cpp b/base/commandLine.cpp index b87ec4453f..a4e836ac05 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -241,18 +241,20 @@ void registerDefaults() { ConfMan.registerDefault("gui_saveload_last_pos", "0"); #ifdef USE_FLUIDSYNTH - // FluidSynth settings. All multiplied by 100, except reverb width - // which is multiplied by 10, and chorus number which is an integer - // to begin with. + // The settings are deliberately stored the same way as in Qsynth. The + // FluidSynth music driver is responsible for transforming them into + // their appropriate values. + ConfMan.registerDefault("fluidsynth_chorus_activate", true); ConfMan.registerDefault("fluidsynth_chorus_nr", 3); - ConfMan.registerDefault("fluidsynth_chorus_level", 200); + ConfMan.registerDefault("fluidsynth_chorus_level", 100); ConfMan.registerDefault("fluidsynth_chorus_speed", 30); - ConfMan.registerDefault("fluidsynth_chorus_depth", 800); + ConfMan.registerDefault("fluidsynth_chorus_depth", 80); ConfMan.registerDefault("fluidsynth_chorus_waveform", "sine"); + ConfMan.registerDefault("fluidsynth_reverb_activate", true); ConfMan.registerDefault("fluidsynth_reverb_roomsize", 20); ConfMan.registerDefault("fluidsynth_reverb_damping", 0); - ConfMan.registerDefault("fluidsynth_reverb_width", 5); + ConfMan.registerDefault("fluidsynth_reverb_width", 1); ConfMan.registerDefault("fluidsynth_reverb_level", 90); ConfMan.registerDefault("fluidsynth_misc_interpolation", "4th"); -- cgit v1.2.3