From 2fa6ec8733687afd9c76c7265bfa0d85a9516666 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Tue, 5 Jul 2022 17:32:12 +0300 Subject: [PATCH] fluidsynth: update from now deprecated api fluid_synth_set_chorus_on and fluid_synth_set_reverb_on were deprecated in favor of new funtions where you can also specify the fx_group the effect would apply. The behavior of the set_* variants was to apply to all groups so we pass -1 to the new functions as per documentation. https://www.fluidsynth.org/api/group__chorus__effect.html#ga3c48310eecdca9cd338799d19f19c32d and https://www.fluidsynth.org/api/group__reverb__effect.html#gacb7917564c988cf54f2e35189b509c8e and the introduction of the change: https://github.com/FluidSynth/fluidsynth/pull/673 Part-of: --- subprojects/gst-plugins-bad/ext/fluidsynth/gstfluiddec.c | 8 ++++---- subprojects/gst-plugins-bad/ext/fluidsynth/meson.build | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/subprojects/gst-plugins-bad/ext/fluidsynth/gstfluiddec.c b/subprojects/gst-plugins-bad/ext/fluidsynth/gstfluiddec.c index c533255..82f6668 100644 --- a/subprojects/gst-plugins-bad/ext/fluidsynth/gstfluiddec.c +++ b/subprojects/gst-plugins-bad/ext/fluidsynth/gstfluiddec.c @@ -200,8 +200,8 @@ gst_fluid_dec_init (GstFluidDec * filter) filter->synth = new_fluid_synth (filter->settings); filter->sf = -1; - fluid_synth_set_chorus_on (filter->synth, filter->synth_chorus); - fluid_synth_set_reverb_on (filter->synth, filter->synth_reverb); + fluid_synth_chorus_on (filter->synth, -1, filter->synth_chorus); + fluid_synth_reverb_on (filter->synth, -1, filter->synth_reverb); fluid_synth_set_gain (filter->synth, filter->synth_gain); fluid_synth_set_polyphony (filter->synth, filter->synth_polyphony); } @@ -634,11 +634,11 @@ gst_fluid_dec_set_property (GObject * object, guint prop_id, break; case PROP_SYNTH_CHORUS: fluiddec->synth_chorus = g_value_get_boolean (value); - fluid_synth_set_chorus_on (fluiddec->synth, fluiddec->synth_chorus); + fluid_synth_chorus_on (fluiddec->synth, -1, fluiddec->synth_chorus); break; case PROP_SYNTH_REVERB: fluiddec->synth_reverb = g_value_get_boolean (value); - fluid_synth_set_reverb_on (fluiddec->synth, fluiddec->synth_reverb); + fluid_synth_reverb_on (fluiddec->synth, -1, fluiddec->synth_reverb); break; case PROP_SYNTH_GAIN: fluiddec->synth_gain = g_value_get_double (value); diff --git a/subprojects/gst-plugins-bad/ext/fluidsynth/meson.build b/subprojects/gst-plugins-bad/ext/fluidsynth/meson.build index 278b697..672ad4f 100644 --- a/subprojects/gst-plugins-bad/ext/fluidsynth/meson.build +++ b/subprojects/gst-plugins-bad/ext/fluidsynth/meson.build @@ -1,4 +1,4 @@ -fluidsynth_dep = dependency('fluidsynth', version : '>= 1.0', required : get_option('fluidsynth')) +fluidsynth_dep = dependency('fluidsynth', version : '>= 2.1', required : get_option('fluidsynth')) if fluidsynth_dep.found() gstfluidsynth = library('gstfluidsynthmidi', -- 2.7.4