Fixes for fluidsynth >= 2.0.0 #765
Conversation
This makes transition fluidsynth 1.x -> 2.x a lot easier. Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
* preset iteration and getters have changed * constants for most defaults are no more available in public headers - fluidsynth wants to be asked Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This reverts commit e67ba7c.
| @@ -221,7 +221,7 @@ endif | |||
| endif | |||
|
|
|||
| HAVE_FFMPEG = $(shell pkg-config --exists libavcodec libavformat libavutil && echo true) | |||
| HAVE_FLUIDSYNTH = $(shell pkg-config --atleast-version=1.1.7 fluidsynth && pkg-config --max-version=1.9.9 fluidsynth && echo true) | |||
| HAVE_FLUIDSYNTH = $(shell pkg-config --atleast-version=1.1.7 fluidsynth && echo true) | |||
There was a problem hiding this comment.
Looks great, thanks very much!
Sorry my github is somehow screwed up, does not allow me to comment on the conversation tab without closing the issue, so I will make comments here.
Please make this target develop branch, not master. all new things should now go into develop first, then cherry-picked from there
There are some other small things, I will write them on the relevant lines.
| @@ -73,20 +73,22 @@ class CarlaPluginFluidSynth : public CarlaPlugin | |||
| fSynth = new_fluid_synth(fSettings); | |||
| CARLA_SAFE_ASSERT_RETURN(fSynth != nullptr,); | |||
|
|
|||
| keepFluidDefaults(); | |||
There was a problem hiding this comment.
I dont like some the naming here. please rename to InitializeFluidDefaultsIfNeeded (which I believe is a lot more clear on what it does.
There was a problem hiding this comment.
err, lowercase I, so initializeFluidDefaultsIfNeeded
| @@ -1683,13 +1768,19 @@ class CarlaPluginFluidSynth : public CarlaPlugin | |||
| float** fAudio16Buffers; | |||
| float fParamBuffers[FluidSynthParametersMax]; | |||
|
|
|||
| static bool bFluidDefaultsKept; | |||
There was a problem hiding this comment.
These class static variables should have prefix "s" (both of them)
|
Story continues with V2 at #766 |
Build tested with fluidsynth 1.1.11 and 2.0.1.