mirror of
https://github.com/schnitzeltony/meta-musicians.git
synced 2026-01-29 17:18:41 +01:00
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
From 281beca9614fa8b5c09527809a6810525faf2177 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
|
Date: Wed, 10 Oct 2018 20:47:04 +0200
|
|
Subject: [PATCH] Fix build with fluidsynth version >= 2.0.0
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Please not that the second change set at
|
|
|
|
Upstream-Status: Backport [1]
|
|
|
|
[1] https://github.com/csound/csound/pull/1046
|
|
|
|
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
|
---
|
|
Opcodes/fluidOpcodes/fluidOpcodes.cpp | 27 +++++++++++++++++++++++++++
|
|
1 file changed, 27 insertions(+)
|
|
|
|
diff --git a/Opcodes/fluidOpcodes/fluidOpcodes.cpp b/Opcodes/fluidOpcodes/fluidOpcodes.cpp
|
|
index d6f4da0fd..aa2b9d4b2 100644
|
|
--- a/Opcodes/fluidOpcodes/fluidOpcodes.cpp
|
|
+++ b/Opcodes/fluidOpcodes/fluidOpcodes.cpp
|
|
@@ -208,6 +208,7 @@ public:
|
|
} else if (listPresets) {
|
|
fluid_sfont_t *fluidSoundfont =
|
|
fluid_synth_get_sfont_by_id(fluidSynth, soundFontId);
|
|
+#if FLUIDSYNTH_VERSION_MAJOR < 2
|
|
fluid_preset_t fluidPreset;
|
|
fluidSoundfont->iteration_start(fluidSoundfont);
|
|
OPARMS oparms;
|
|
@@ -218,6 +219,18 @@ public:
|
|
soundFontId, fluidPreset.get_banknum(&fluidPreset),
|
|
fluidPreset.get_num(&fluidPreset),
|
|
fluidPreset.get_name(&fluidPreset));
|
|
+#else
|
|
+ fluid_preset_t *fluidPreset;
|
|
+ fluid_sfont_iteration_start(fluidSoundfont);
|
|
+ OPARMS oparms;
|
|
+ csound->GetOParms(csound, &oparms);
|
|
+ if (oparms.msglevel & 0x7)
|
|
+ while ((fluidPreset = fluid_sfont_iteration_next(fluidSoundfont))) {
|
|
+ log(csound, "SoundFont: %3d Bank: %3d Preset: %3d %s\n",
|
|
+ soundFontId, fluid_preset_get_banknum(fluidPreset),
|
|
+ fluid_preset_get_num(fluidPreset),
|
|
+ fluid_preset_get_name(fluidPreset));
|
|
+#endif
|
|
}
|
|
}
|
|
return result;
|
|
--
|
|
2.14.4
|
|
|