zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-03-02 23:42:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added no/yes options to boolean string settings that were missing them.

Browse source 
Added synth.midi-mode setting with normal/gm/gs/xg options, does not do anything yet.
Removed -Wno-unused from configure.ac so that warnings are given for unused variables and functions.
This commit is contained in:
Josh Green 2009-10-06 06:53:53 +00:00
parent 16a6d7ef63
commit 799f01a2dc
4 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fluidsynth/configure.ac
View file

@ -145,10 +145,10 @@ AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],
ENABLE_DEBUG=$enableval) ENABLE_DEBUG=$enableval)
if test "$ENABLE_DEBUG" = "yes"; then if test "$ENABLE_DEBUG" = "yes"; then
CFLAGS="${CFLAGS} ${FCCFLAGS} -g -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wno-unused" CFLAGS="${CFLAGS} ${FCCFLAGS} -g -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes"
AC_DEFINE(DEBUG, 1, [Define to activate debugging message]) AC_DEFINE(DEBUG, 1, [Define to activate debugging message])
else else
CFLAGS="${CFLAGS} ${FCCFLAGS} -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wno-unused -Winline" CFLAGS="${CFLAGS} ${FCCFLAGS} -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Winline"
AC_DEFINE(DEBUG, 0, [Define to activate debugging message]) AC_DEFINE(DEBUG, 0, [Define to activate debugging message])
fi fi

2
fluidsynth/src/fluid_jack.c
View file

@ -90,6 +90,8 @@ fluid_jack_audio_driver_settings(fluid_settings_t* settings)
{ {
fluid_settings_register_str(settings, "audio.jack.id", "fluidsynth", 0, NULL, NULL); fluid_settings_register_str(settings, "audio.jack.id", "fluidsynth", 0, NULL, NULL);
fluid_settings_register_str(settings, "audio.jack.multi", "no", 0, NULL, NULL); fluid_settings_register_str(settings, "audio.jack.multi", "no", 0, NULL, NULL);
fluid_settings_add_option(settings, "audio.jack.multi", "no");
fluid_settings_add_option(settings, "audio.jack.multi", "yes");
fluid_settings_register_int(settings, "audio.jack.autoconnect", 0, 0, 1, FLUID_HINT_TOGGLED, NULL, NULL); fluid_settings_register_int(settings, "audio.jack.autoconnect", 0, 0, 1, FLUID_HINT_TOGGLED, NULL, NULL);
} }

2
fluidsynth/src/fluid_midi.c
View file

@ -1142,6 +1142,8 @@ void fluid_player_settings(fluid_settings_t* settings)
/* Selects whether the player should reset the synth between /* Selects whether the player should reset the synth between
songs, or not. */ songs, or not. */
fluid_settings_register_str(settings, "player.reset-synth", "yes", 0, NULL, NULL); fluid_settings_register_str(settings, "player.reset-synth", "yes", 0, NULL, NULL);
fluid_settings_add_option(settings, "player.reset-synth", "no");
fluid_settings_add_option(settings, "player.reset-synth", "yes");
} }

16
fluidsynth/src/fluid_synth.c
View file

@ -199,10 +199,20 @@ static fluid_revmodel_presets_t revmodel_preset[] = {
void fluid_synth_settings(fluid_settings_t* settings) void fluid_synth_settings(fluid_settings_t* settings)
{ {
fluid_settings_register_str(settings, "synth.verbose", "no", 0, NULL, NULL); fluid_settings_register_str(settings, "synth.verbose", "no", 0, NULL, NULL);
fluid_settings_add_option(settings, "synth.verbose", "no");
fluid_settings_add_option(settings, "synth.verbose", "yes");
fluid_settings_register_str(settings, "synth.dump", "no", 0, NULL, NULL); fluid_settings_register_str(settings, "synth.dump", "no", 0, NULL, NULL);
fluid_settings_add_option(settings, "synth.dump", "no");
fluid_settings_add_option(settings, "synth.dump", "yes");
fluid_settings_register_str(settings, "synth.reverb.active", "yes", 0, NULL, NULL); fluid_settings_register_str(settings, "synth.reverb.active", "yes", 0, NULL, NULL);
fluid_settings_add_option(settings, "synth.reverb.active", "no");
fluid_settings_add_option(settings, "synth.reverb.active", "yes");
fluid_settings_register_str(settings, "synth.chorus.active", "yes", 0, NULL, NULL); fluid_settings_register_str(settings, "synth.chorus.active", "yes", 0, NULL, NULL);
fluid_settings_add_option(settings, "synth.chorus.active", "no");
fluid_settings_add_option(settings, "synth.chorus.active", "yes");
fluid_settings_register_str(settings, "synth.ladspa.active", "no", 0, NULL, NULL); fluid_settings_register_str(settings, "synth.ladspa.active", "no", 0, NULL, NULL);
fluid_settings_add_option(settings, "synth.ladspa.active", "no");
fluid_settings_add_option(settings, "synth.ladspa.active", "yes");
fluid_settings_register_str(settings, "midi.portname", "", 0, NULL, NULL); fluid_settings_register_str(settings, "midi.portname", "", 0, NULL, NULL);
fluid_settings_register_int(settings, "synth.polyphony", fluid_settings_register_int(settings, "synth.polyphony",
@ -224,6 +234,12 @@ void fluid_synth_settings(fluid_settings_t* settings)
fluid_settings_register_int(settings, "synth.device-id", fluid_settings_register_int(settings, "synth.device-id",
0, 0, 126, 0, NULL, NULL); 0, 0, 126, 0, NULL, NULL);
fluid_settings_register_int(settings, "synth.cpu-cores", 1, 1, 256, 0, NULL, NULL); fluid_settings_register_int(settings, "synth.cpu-cores", 1, 1, 256, 0, NULL, NULL);
fluid_settings_register_str(settings, "synth.midi-mode", "normal", 0, NULL, NULL);
fluid_settings_add_option(settings, "synth.midi-mode", "normal");
fluid_settings_add_option(settings, "synth.midi-mode", "gm");
fluid_settings_add_option(settings, "synth.midi-mode", "gs");
fluid_settings_add_option(settings, "synth.midi-mode", "xg");
} }
/* /*