zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

carla: Update to latest & fix for fluidsynth >= 2.0.0

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-10-11 01:37:49 +02:00
parent 6b6c5b58a5
commit b03450dc51
3 changed files with 391 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

245
recipes-misc/recipes-multimedia/carla/carla/0003-Fluidsynths-Ensure-fluidsynth-s-defaults-are-set-onc.patch Normal file
View File

@@ -0,0 +1,245 @@
From 4db0ed714fdea67a5e1ca38e55eaf2cfaac05151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 10 Oct 2018 23:48:22 +0200
Subject: [PATCH 1/3] Fluidsynths: Ensure fluidsynth's defaults are set once
and in one place
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This makes transition fluidsynth 1.x -> 2.x a lot easier.
Upstream-Status: Submitted [1]
[1] https://github.com/falkTX/Carla/pull/765
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
source/backend/plugin/CarlaPluginFluidSynth.cpp | 67 ++++++++++++++++++-------
1 file changed, 48 insertions(+), 19 deletions(-)
diff --git a/source/backend/plugin/CarlaPluginFluidSynth.cpp b/source/backend/plugin/CarlaPluginFluidSynth.cpp
index be9e720a..ed0a55ac 100644
--- a/source/backend/plugin/CarlaPluginFluidSynth.cpp
+++ b/source/backend/plugin/CarlaPluginFluidSynth.cpp
@@ -73,20 +73,22 @@ public:
fSynth = new_fluid_synth(fSettings);
CARLA_SAFE_ASSERT_RETURN(fSynth != nullptr,);
+ keepFluidDefaults();
+
fluid_synth_set_sample_rate(fSynth, (float)pData->engine->getSampleRate());
// set default values
fluid_synth_set_reverb_on(fSynth, 1);
- fluid_synth_set_reverb(fSynth, FLUID_REVERB_DEFAULT_ROOMSIZE, FLUID_REVERB_DEFAULT_DAMP, FLUID_REVERB_DEFAULT_WIDTH, FLUID_REVERB_DEFAULT_LEVEL);
+ fluid_synth_set_reverb(fSynth, fFluidDefaults[FluidSynthReverbRoomSize], fFluidDefaults[FluidSynthReverbDamp], fFluidDefaults[FluidSynthReverbWidth], fFluidDefaults[FluidSynthReverbLevel]);
fluid_synth_set_chorus_on(fSynth, 1);
- fluid_synth_set_chorus(fSynth, FLUID_CHORUS_DEFAULT_N, FLUID_CHORUS_DEFAULT_LEVEL, FLUID_CHORUS_DEFAULT_SPEED, FLUID_CHORUS_DEFAULT_DEPTH, FLUID_CHORUS_DEFAULT_TYPE);
+ fluid_synth_set_chorus(fSynth, fFluidDefaults[FluidSynthChorusNr], fFluidDefaults[FluidSynthChorusLevel], fFluidDefaults[FluidSynthChorusSpeedHz], fFluidDefaults[FluidSynthChorusDepthMs], fFluidDefaults[FluidSynthChorusType]);
fluid_synth_set_polyphony(fSynth, FLUID_DEFAULT_POLYPHONY);
fluid_synth_set_gain(fSynth, 1.0f);
for (int i=0; i < MAX_MIDI_CHANNELS; ++i)
- fluid_synth_set_interp_method(fSynth, i, FLUID_INTERP_DEFAULT);
+ fluid_synth_set_interp_method(fSynth, i, fFluidDefaults[FluidSynthInterpolation]);
}
~CarlaPluginFluidSynth() override
@@ -195,7 +197,7 @@ public:
case 1:
return FLUID_CHORUS_MOD_TRIANGLE;
default:
- return FLUID_CHORUS_DEFAULT_TYPE;
+ return fFluidDefaults[FluidSynthChorusType];
}
case FluidSynthInterpolation:
switch (scalePointId)
@@ -209,7 +211,7 @@ public:
case 3:
return FLUID_INTERP_7THORDER;
default:
- return FLUID_INTERP_DEFAULT;
+ return fFluidDefaults[FluidSynthInterpolation];
}
default:
return 0.0f;
@@ -721,7 +723,7 @@ public:
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.0f;
pData->param.ranges[j].max = 1.0f;
- pData->param.ranges[j].def = 1.0f;
+ pData->param.ranges[j].def = fFluidDefaults[j];
pData->param.ranges[j].step = 1.0f;
pData->param.ranges[j].stepSmall = 1.0f;
pData->param.ranges[j].stepLarge = 1.0f;
@@ -734,7 +736,7 @@ public:
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.0f;
pData->param.ranges[j].max = 1.2f;
- pData->param.ranges[j].def = FLUID_REVERB_DEFAULT_ROOMSIZE;
+ pData->param.ranges[j].def = fFluidDefaults[j];
pData->param.ranges[j].step = 0.01f;
pData->param.ranges[j].stepSmall = 0.0001f;
pData->param.ranges[j].stepLarge = 0.1f;
@@ -747,7 +749,7 @@ public:
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.0f;
pData->param.ranges[j].max = 1.0f;
- pData->param.ranges[j].def = FLUID_REVERB_DEFAULT_DAMP;
+ pData->param.ranges[j].def = fFluidDefaults[j];
pData->param.ranges[j].step = 0.01f;
pData->param.ranges[j].stepSmall = 0.0001f;
pData->param.ranges[j].stepLarge = 0.1f;
@@ -761,7 +763,7 @@ public:
pData->param.data[j].midiCC = MIDI_CONTROL_REVERB_SEND_LEVEL;
pData->param.ranges[j].min = 0.0f;
pData->param.ranges[j].max = 1.0f;
- pData->param.ranges[j].def = FLUID_REVERB_DEFAULT_LEVEL;
+ pData->param.ranges[j].def = fFluidDefaults[j];
pData->param.ranges[j].step = 0.01f;
pData->param.ranges[j].stepSmall = 0.0001f;
pData->param.ranges[j].stepLarge = 0.1f;
@@ -774,7 +776,7 @@ public:
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.0f;
pData->param.ranges[j].max = 10.0f; // should be 100, but that sounds too much
- pData->param.ranges[j].def = FLUID_REVERB_DEFAULT_WIDTH;
+ pData->param.ranges[j].def = fFluidDefaults[j];
pData->param.ranges[j].step = 0.01f;
pData->param.ranges[j].stepSmall = 0.0001f;
pData->param.ranges[j].stepLarge = 0.1f;
@@ -787,7 +789,7 @@ public:
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.0f;
pData->param.ranges[j].max = 1.0f;
- pData->param.ranges[j].def = 1.0f;
+ pData->param.ranges[j].def = fFluidDefaults[j];
pData->param.ranges[j].step = 1.0f;
pData->param.ranges[j].stepSmall = 1.0f;
pData->param.ranges[j].stepLarge = 1.0f;
@@ -800,7 +802,7 @@ public:
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.0f;
pData->param.ranges[j].max = 99.0f;
- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_N;
+ pData->param.ranges[j].def = fFluidDefaults[j];
pData->param.ranges[j].step = 1.0f;
pData->param.ranges[j].stepSmall = 1.0f;
pData->param.ranges[j].stepLarge = 10.0f;
@@ -813,7 +815,7 @@ public:
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.0f;
pData->param.ranges[j].max = 10.0f;
- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_LEVEL;
+ pData->param.ranges[j].def = fFluidDefaults[j];
pData->param.ranges[j].step = 0.01f;
pData->param.ranges[j].stepSmall = 0.0001f;
pData->param.ranges[j].stepLarge = 0.1f;
@@ -826,7 +828,7 @@ public:
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.29f;
pData->param.ranges[j].max = 5.0f;
- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_SPEED;
+ pData->param.ranges[j].def = fFluidDefaults[j];
pData->param.ranges[j].step = 0.01f;
pData->param.ranges[j].stepSmall = 0.0001f;
pData->param.ranges[j].stepLarge = 0.1f;
@@ -839,7 +841,7 @@ public:
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.0f;
pData->param.ranges[j].max = float(2048.0 * 1000.0 / pData->engine->getSampleRate()); // FIXME?
- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_DEPTH;
+ pData->param.ranges[j].def = fFluidDefaults[j];
pData->param.ranges[j].step = 0.01f;
pData->param.ranges[j].stepSmall = 0.0001f;
pData->param.ranges[j].stepLarge = 0.1f;
@@ -852,7 +854,7 @@ public:
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = FLUID_CHORUS_MOD_SINE;
pData->param.ranges[j].max = FLUID_CHORUS_MOD_TRIANGLE;
- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_TYPE;
+ pData->param.ranges[j].def = fFluidDefaults[j];
pData->param.ranges[j].step = 1.0f;
pData->param.ranges[j].stepSmall = 1.0f;
pData->param.ranges[j].stepLarge = 1.0f;
@@ -865,7 +867,7 @@ public:
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 1.0f;
pData->param.ranges[j].max = 512.0f; // max theoric is 65535
- pData->param.ranges[j].def = (float)fluid_synth_get_polyphony(fSynth);
+ pData->param.ranges[j].def = fFluidDefaults[j];
pData->param.ranges[j].step = 1.0f;
pData->param.ranges[j].stepSmall = 1.0f;
pData->param.ranges[j].stepLarge = 10.0f;
@@ -878,7 +880,7 @@ public:
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = FLUID_INTERP_NONE;
pData->param.ranges[j].max = FLUID_INTERP_HIGHEST;
- pData->param.ranges[j].def = FLUID_INTERP_DEFAULT;
+ pData->param.ranges[j].def = fFluidDefaults[j];
pData->param.ranges[j].step = 1.0f;
pData->param.ranges[j].stepSmall = 1.0f;
pData->param.ranges[j].stepLarge = 1.0f;
@@ -891,7 +893,7 @@ public:
pData->param.data[j].rindex = j;
pData->param.ranges[j].min = 0.0f;
pData->param.ranges[j].max = 65535.0f;
- pData->param.ranges[j].def = 0.0f;
+ pData->param.ranges[j].def = fFluidDefaults[j];
pData->param.ranges[j].step = 1.0f;
pData->param.ranges[j].stepSmall = 1.0f;
pData->param.ranges[j].stepLarge = 1.0f;
@@ -1656,6 +1658,27 @@ public:
}
private:
+ void keepFluidDefaults()
+ {
+ if (!bFluidDefaultsKept)
+ {
+ fFluidDefaults[FluidSynthReverbOnOff] = 1.0f;
+ fFluidDefaults[FluidSynthReverbRoomSize] = FLUID_REVERB_DEFAULT_ROOMSIZE;
+ fFluidDefaults[FluidSynthReverbDamp] = FLUID_REVERB_DEFAULT_DAMP;
+ fFluidDefaults[FluidSynthReverbLevel] = FLUID_REVERB_DEFAULT_LEVEL;
+ fFluidDefaults[FluidSynthReverbWidth] = FLUID_REVERB_DEFAULT_WIDTH;
+ fFluidDefaults[FluidSynthChorusOnOff] = 1.0f;
+ fFluidDefaults[FluidSynthChorusNr] = FLUID_CHORUS_DEFAULT_N;
+ fFluidDefaults[FluidSynthChorusLevel] = FLUID_CHORUS_DEFAULT_LEVEL;
+ fFluidDefaults[FluidSynthChorusSpeedHz] = FLUID_CHORUS_DEFAULT_SPEED;
+ fFluidDefaults[FluidSynthChorusDepthMs] = FLUID_CHORUS_DEFAULT_DEPTH;
+ fFluidDefaults[FluidSynthChorusType] = FLUID_CHORUS_DEFAULT_TYPE;
+ fFluidDefaults[FluidSynthPolyphony] = (float)fluid_synth_get_polyphony(fSynth);
+ fFluidDefaults[FluidSynthInterpolation] = FLUID_INTERP_DEFAULT;
+ fFluidDefaults[FluidSynthVoiceCount] = 0.0f;
+ }
+ }
+
enum FluidSynthParameters {
FluidSynthReverbOnOff = 0,
FluidSynthReverbRoomSize = 1,
@@ -1683,6 +1706,9 @@ private:
float** fAudio16Buffers;
float fParamBuffers[FluidSynthParametersMax];
+ static bool bFluidDefaultsKept;
+ static float fFluidDefaults[FluidSynthParametersMax];
+
int32_t fCurMidiProgs[MAX_MIDI_CHANNELS];
const char* fLabel;
@@ -1690,6 +1716,9 @@ private:
CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaPluginFluidSynth)
};
+bool CarlaPluginFluidSynth::bFluidDefaultsKept = false;
+float CarlaPluginFluidSynth::fFluidDefaults[FluidSynthParametersMax];
+
CARLA_BACKEND_END_NAMESPACE
#endif // HAVE_FLUIDSYNTH
--
2.14.4

143
recipes-misc/recipes-multimedia/carla/carla/0004-Fixes-for-fluidsynth-2.0.0.patch Normal file
View File

@@ -0,0 +1,143 @@
From 0e23f43a997a44bb4985f826cd31f180ff2bae13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 11 Oct 2018 00:09:56 +0200
Subject: [PATCH 2/3] Fixes for fluidsynth >= 2.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* preset iteration and getters have changed
* constants for most defaults are no more available in public headers -
fluidsynth wants to be asked
Upstream-Status: Submitted [1]
[1] https://github.com/falkTX/Carla/pull/765
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
source/backend/plugin/CarlaPluginFluidSynth.cpp | 62 +++++++++++++++++++++++++
source/discovery/carla-discovery.cpp | 5 ++
2 files changed, 67 insertions(+)
diff --git a/source/backend/plugin/CarlaPluginFluidSynth.cpp b/source/backend/plugin/CarlaPluginFluidSynth.cpp
index ed0a55ac..44621e01 100644
--- a/source/backend/plugin/CarlaPluginFluidSynth.cpp
+++ b/source/backend/plugin/CarlaPluginFluidSynth.cpp
@@ -943,6 +943,7 @@ public:
if (fluid_sfont_t* const f_sfont = fluid_synth_get_sfont_by_id(fSynth, fSynthId))
{
+#if FLUIDSYNTH_VERSION_MAJOR < 2
fluid_preset_t f_preset;
// initial check to know how many midi-programs we have
@@ -971,6 +972,36 @@ public:
pData->midiprog.data[i].program = (tmp >= 0) ? static_cast<uint32_t>(tmp) : 0;
pData->midiprog.data[i].name = carla_strdup(f_preset.get_name(&f_preset));
+#else
+ fluid_preset_t* f_preset;
+
+ // initial check to know how many midi-programs we have
+ fluid_sfont_iteration_start(f_sfont);
+ for (; fluid_sfont_iteration_next(f_sfont);)
+ ++count;
+
+ // sound kits must always have at least 1 midi-program
+ CARLA_SAFE_ASSERT_RETURN(count > 0,);
+
+ pData->midiprog.createNew(count);
+
+ // Update data
+ int tmp;
+ uint32_t i = 0;
+ fluid_sfont_iteration_start(f_sfont);
+
+ for (; (f_preset = fluid_sfont_iteration_next(f_sfont));)
+ {
+ CARLA_SAFE_ASSERT_BREAK(i < count);
+
+ tmp = fluid_preset_get_banknum(f_preset);
+ pData->midiprog.data[i].bank = (tmp >= 0) ? static_cast<uint32_t>(tmp) : 0;
+
+ tmp = fluid_preset_get_num(f_preset);
+ pData->midiprog.data[i].program = (tmp >= 0) ? static_cast<uint32_t>(tmp) : 0;
+
+ pData->midiprog.data[i].name = carla_strdup(fluid_preset_get_name(f_preset));
+#endif
if (pData->midiprog.data[i].bank == 128 && ! hasDrums)
{
@@ -1662,17 +1693,48 @@ private:
{
if (!bFluidDefaultsKept)
{
+ // reverb defaults
fFluidDefaults[FluidSynthReverbOnOff] = 1.0f;
+#if FLUIDSYNTH_VERSION_MAJOR < 2
fFluidDefaults[FluidSynthReverbRoomSize] = FLUID_REVERB_DEFAULT_ROOMSIZE;
fFluidDefaults[FluidSynthReverbDamp] = FLUID_REVERB_DEFAULT_DAMP;
fFluidDefaults[FluidSynthReverbLevel] = FLUID_REVERB_DEFAULT_LEVEL;
fFluidDefaults[FluidSynthReverbWidth] = FLUID_REVERB_DEFAULT_WIDTH;
+#else
+ double reverbVal;
+ fluid_settings_getnum_default(fSettings, "synth.reverb.room-size", &reverbVal);
+ fFluidDefaults[FluidSynthReverbRoomSize] = reverbVal;
+ fluid_settings_getnum_default(fSettings, "synth.reverb.damp", &reverbVal);
+ fFluidDefaults[FluidSynthReverbDamp] = reverbVal;
+ fluid_settings_getnum_default(fSettings, "synth.reverb.level", &reverbVal);
+ fFluidDefaults[FluidSynthReverbLevel] = reverbVal;
+ fluid_settings_getnum_default(fSettings, "synth.reverb.width", &reverbVal);
+ fFluidDefaults[FluidSynthReverbWidth] = reverbVal;
+#endif
+
+ // chorus defaults
fFluidDefaults[FluidSynthChorusOnOff] = 1.0f;
+#if FLUIDSYNTH_VERSION_MAJOR < 2
fFluidDefaults[FluidSynthChorusNr] = FLUID_CHORUS_DEFAULT_N;
fFluidDefaults[FluidSynthChorusLevel] = FLUID_CHORUS_DEFAULT_LEVEL;
fFluidDefaults[FluidSynthChorusSpeedHz] = FLUID_CHORUS_DEFAULT_SPEED;
fFluidDefaults[FluidSynthChorusDepthMs] = FLUID_CHORUS_DEFAULT_DEPTH;
fFluidDefaults[FluidSynthChorusType] = FLUID_CHORUS_DEFAULT_TYPE;
+#else
+ double chorusVal;
+ fluid_settings_getnum_default(fSettings, "synth.chorus.nr", &chorusVal);
+ fFluidDefaults[FluidSynthChorusNr] = chorusVal;
+ fluid_settings_getnum_default(fSettings, "synth.chorus.level", &chorusVal);
+ fFluidDefaults[FluidSynthChorusLevel] = chorusVal;
+ fluid_settings_getnum_default(fSettings, "synth.chorus.speed", &chorusVal);
+ fFluidDefaults[FluidSynthChorusSpeedHz] = chorusVal;
+ fluid_settings_getnum_default(fSettings, "synth.chorus.depth", &chorusVal);
+ fFluidDefaults[FluidSynthChorusDepthMs] = chorusVal;
+ // There is no settings for chorus default type
+ fFluidDefaults[FluidSynthChorusType] = (float)fluid_synth_get_chorus_type(fSynth);
+#endif
+
+ // misc. defaults
fFluidDefaults[FluidSynthPolyphony] = (float)fluid_synth_get_polyphony(fSynth);
fFluidDefaults[FluidSynthInterpolation] = FLUID_INTERP_DEFAULT;
fFluidDefaults[FluidSynthVoiceCount] = 0.0f;
diff --git a/source/discovery/carla-discovery.cpp b/source/discovery/carla-discovery.cpp
index a0745e23..d2cd2931 100644
--- a/source/discovery/carla-discovery.cpp
+++ b/source/discovery/carla-discovery.cpp
@@ -1323,10 +1323,15 @@ static void do_fluidsynth_check(const char* const filename, const bool doInit)
if (fluid_sfont_t* const f_sfont = fluid_synth_get_sfont_by_id(f_synth, static_cast<uint>(f_id)))
{
+#if FLUIDSYNTH_VERSION_MAJOR < 2
fluid_preset_t f_preset;
f_sfont->iteration_start(f_sfont);
for (; f_sfont->iteration_next(f_sfont, &f_preset);)
+#else
+ fluid_sfont_iteration_start(f_sfont);
+ for (; fluid_sfont_iteration_next(f_sfont);)
+#endif
++programs;
}
--
2.14.4

4
recipes-misc/recipes-multimedia/carla/carla_git.bb
View File

@@ -10,8 +10,10 @@ SRC_URI = " \
git://github.com/falkTX/Carla.git \
file://0001-do-not-try-to-cross-run-carla-lv2-export.patch \
file://0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch \
file://0003-Fluidsynths-Ensure-fluidsynth-s-defaults-are-set-onc.patch \
file://0004-Fixes-for-fluidsynth-2.0.0.patch \
"
SRCREV = "430740a896d8f7546e02b524302e2cfda4509ff9"
SRCREV = "d73c0788ccc5fb9019d224046ef1b652aa5a9bbe"
S = "${WORKDIR}/git"
PV = "1.9.11+git${SRCPV}"