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

rename reverb roomsize setting to match naming conventions

Browse source
This commit is contained in:
derselbst 2018-05-17 21:44:03 +02:00
parent dac1fe48cc
commit 0188cd9d93
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/fluidsettings.xml
View file

@ -302,7 +302,7 @@ Developers: Settings can be deprecated by adding: <deprecated>SOME TEXT</depreca
Sets the reverb output amplitude.</desc>
</setting>
<setting>
<name>reverb.roomsize</name>
<name>reverb.room-size</name>
<type>num</type>
<def>0.2</def>
<min>0</min>

2
src/bindings/fluid_cmd.c
View file

@ -832,7 +832,7 @@ fluid_handle_reverbsetroomsize(void* data, int ac, char** av, fluid_ostream_t ou
return FLUID_FAILED;
}
fluid_ostream_printf(out, "rev_setroomsize is deprecated! Use 'set synth.reverb.roomsize %s' instead.\n", av[0]);
fluid_ostream_printf(out, "rev_setroomsize is deprecated! Use 'set synth.reverb.room-size %s' instead.\n", av[0]);
room_size = atof(av[0]);
if (room_size < 0){

8
src/synth/fluid_synth.c
View file

@ -197,7 +197,7 @@ void fluid_synth_settings(fluid_settings_t* settings)
fluid_settings_register_int(settings, "synth.verbose", 0, 0, 1, FLUID_HINT_TOGGLED);
fluid_settings_register_int(settings, "synth.reverb.active", 1, 0, 1, FLUID_HINT_TOGGLED);
fluid_settings_register_num(settings, "synth.reverb.roomsize", FLUID_REVERB_DEFAULT_ROOMSIZE, 0.0f, 1.0f, 0);
fluid_settings_register_num(settings, "synth.reverb.room-size", FLUID_REVERB_DEFAULT_ROOMSIZE, 0.0f, 1.0f, 0);
fluid_settings_register_num(settings, "synth.reverb.damp", FLUID_REVERB_DEFAULT_DAMP, 0.0f, 1.0f, 0);
fluid_settings_register_num(settings, "synth.reverb.width", FLUID_REVERB_DEFAULT_WIDTH, 0.0f, 100.0f, 0);
fluid_settings_register_num(settings, "synth.reverb.level", FLUID_REVERB_DEFAULT_LEVEL, 0.0f, 1.0f, 0);
@ -654,7 +654,7 @@ new_fluid_synth(fluid_settings_t *settings)
fluid_synth_handle_overflow, synth);
fluid_settings_callback_str(settings, "synth.overflow.important-channels",
fluid_synth_handle_important_channels, synth);
fluid_settings_callback_num(settings, "synth.reverb.roomsize",
fluid_settings_callback_num(settings, "synth.reverb.room-size",
fluid_synth_handle_reverb_chorus_num, synth);
fluid_settings_callback_num(settings, "synth.reverb.damp",
fluid_synth_handle_reverb_chorus_num, synth);
@ -835,7 +835,7 @@ new_fluid_synth(fluid_settings_t *settings)
{
double room, damp, width, level;
fluid_settings_getnum(settings, "synth.reverb.roomsize", &room);
fluid_settings_getnum(settings, "synth.reverb.room-size", &room);
fluid_settings_getnum(settings, "synth.reverb.damp", &damp);
fluid_settings_getnum(settings, "synth.reverb.width", &width);
fluid_settings_getnum(settings, "synth.reverb.level", &level);
@ -3436,7 +3436,7 @@ static void fluid_synth_handle_reverb_chorus_num (void *data, const char *name,
fluid_synth_t *synth = (fluid_synth_t *)data;
fluid_return_if_fail(synth != NULL);
if (FLUID_STRCMP(name, "synth.reverb.roomsize") == 0) {
if (FLUID_STRCMP(name, "synth.reverb.room-size") == 0) {
fluid_synth_set_reverb_roomsize(synth, value);
}
else if (FLUID_STRCMP(name, "synth.reverb.damp") == 0) {

4
test/test_synth_chorus_reverb.c
View file

@ -9,7 +9,7 @@ int main(void)
fluid_settings_t *settings = new_fluid_settings();
TEST_ASSERT(settings != NULL);
TEST_SUCCESS(fluid_settings_setnum(settings, "synth.reverb.roomsize", 0.1));
TEST_SUCCESS(fluid_settings_setnum(settings, "synth.reverb.room-size", 0.1));
TEST_SUCCESS(fluid_settings_setnum(settings, "synth.reverb.damp", 0.2));
TEST_SUCCESS(fluid_settings_setnum(settings, "synth.reverb.width", 0.3));
TEST_SUCCESS(fluid_settings_setnum(settings, "synth.reverb.level", 0.4));
@ -34,7 +34,7 @@ int main(void)
TEST_ASSERT(fluid_synth_get_chorus_depth(synth) == 0.7);
// update the realtime settings afterward
TEST_SUCCESS(fluid_settings_setnum(settings, "synth.reverb.roomsize", 0.11));
TEST_SUCCESS(fluid_settings_setnum(settings, "synth.reverb.room-size", 0.11));
TEST_SUCCESS(fluid_settings_setnum(settings, "synth.reverb.damp", 0.22));
TEST_SUCCESS(fluid_settings_setnum(settings, "synth.reverb.width", 0.33));
TEST_SUCCESS(fluid_settings_setnum(settings, "synth.reverb.level", 0.44));