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

lmms: update sources to get rid of fluidsysnth 2.x patch

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-10-30 18:32:34 +01:00
parent 512e01c6e0
commit ac07c005c8
4 changed files with 2 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
recipes-misc/recipes-multimedia/lmms/lmms.bb
View File

@@ -8,8 +8,7 @@ SRC_URI += " \
file://0001-Find-native-bin2res.patch \
file://0002-zynaddsubfx-link-agains-X11.patch \
file://0003-CMake-rpmalloc-Do-not-overwrite-CMAKE_C_FLAGS.patch \
file://0004-Allow-building-SF2-player-with-FluidSynth-2.x.patch \
file://0005-carlabase-Do-not-add-RPATH-to-carlabase.patch \
file://0004-carlabase-Do-not-add-RPATH-to-carlabase.patch \
"
DEPENDS += " \

2
recipes-misc/recipes-multimedia/lmms/lmms.inc
View File

@@ -4,6 +4,6 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=751419260aa954499f7abaabaa882bbe"
SRC_URI = "gitsm://github.com/LMMS/${BPN}.git;branch=stable-1.2"
SRCREV = "a2685c1cca3ef20e317d69eccb915f9d7b05e349"
SRCREV = "d8fb07ff52ee87a290ad7e69d0851cfb1c20d261"
S = "${WORKDIR}/git"
PV = "1.2.0-rc7+git${SRCPV}"

345
recipes-misc/recipes-multimedia/lmms/lmms/0004-Allow-building-SF2-player-with-FluidSynth-2.x.patch
View File

@@ -1,345 +0,0 @@
From a2eb2232312951af813625e1b8aea668418b0de0 Mon Sep 17 00:00:00 2001
From: Hyunjin Song <tteu.ingog@gmail.com>
Date: Sun, 7 Oct 2018 15:07:56 +0900
Subject: [PATCH] Allow building SF2 player with FluidSynth 2.x
Resolves the incompatibility between FluidSynth 1.x and 2.x
due to some API changes by shimming some functions.
Note that 1.x and 2.x are not completely ABI compatible.
Upstream-Status: Pending [1]
[1] https://github.com/LMMS/lmms/issues/4640
---
plugins/sf2_player/fluidsynthshims.h | 78 +++++++++++++++++++++++++++++++++++
plugins/sf2_player/patches_dialog.cpp | 44 ++++++++++++--------
plugins/sf2_player/patches_dialog.h | 2 +-
plugins/sf2_player/sf2_player.cpp | 61 ++++++++++++++++++++-------
plugins/sf2_player/sf2_player.h | 2 +-
5 files changed, 152 insertions(+), 35 deletions(-)
create mode 100644 plugins/sf2_player/fluidsynthshims.h
diff --git a/plugins/sf2_player/fluidsynthshims.h b/plugins/sf2_player/fluidsynthshims.h
new file mode 100644
index 000000000..593bd70d3
--- /dev/null
+++ b/plugins/sf2_player/fluidsynthshims.h
@@ -0,0 +1,78 @@
+/*
+ * fluidsynthshims.h - a shim header for FluidSynth 2.0 API changes
+ *
+ * Copyright (c) 2018 Hyunjin Song <tteu.ingog@gmail.com>
+ *
+ * This file is part of LMMS - https://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+
+#ifndef FLUIDSYNTHSHIMS_H
+#define FLUIDSYNTHSHIMS_H
+
+#include <fluidsynth.h>
+
+#if FLUIDSYNTH_VERSION_MAJOR < 2
+
+inline const char* fluid_preset_get_name(fluid_preset_t* preset)
+{
+ return preset->get_name(preset);
+}
+
+inline int fluid_preset_get_banknum(fluid_preset_t* preset)
+{
+ return preset->get_banknum(preset);
+}
+
+inline int fluid_preset_get_num(fluid_preset_t* preset)
+{
+ return preset->get_num(preset);
+}
+
+inline fluid_sfont_t* fluid_preset_get_sfont(fluid_preset_t* preset)
+{
+ return preset->sfont;
+}
+
+inline char* fluid_sfont_get_name(fluid_sfont_t* sfont)
+{
+ return sfont->get_name(sfont);
+}
+
+inline void fluid_sfont_iteration_start(fluid_sfont_t* sfont)
+{
+ sfont->iteration_start(sfont);
+}
+
+// Due to the API change, we can't simply shim the 'fluid_sfont_iteration_next' function
+inline fluid_preset_t* fluid_sfont_iteration_next_wrapper(fluid_sfont_t* sfont, fluid_preset_t* preset)
+{
+ return sfont->iteration_next(sfont, preset) ? preset : nullptr;
+}
+
+#else // FLUIDSYNTH_VERSION_MAJOR < 2
+
+inline fluid_preset_t* fluid_sfont_iteration_next_wrapper(fluid_sfont_t* sfont, fluid_preset_t*)
+{
+ return fluid_sfont_iteration_next(sfont);
+}
+
+#endif // FLUIDSYNTH_VERSION_MAJOR < 2
+
+#endif // FLUIDSYNTHSHIMS_H
diff --git a/plugins/sf2_player/patches_dialog.cpp b/plugins/sf2_player/patches_dialog.cpp
index 6ae791c15..189d996f3 100644
--- a/plugins/sf2_player/patches_dialog.cpp
+++ b/plugins/sf2_player/patches_dialog.cpp
@@ -143,7 +143,6 @@ void patchesDialog::setup ( fluid_synth_t * pSynth, int iChan,
m_iChan = iChan;
- fluid_preset_t preset;
QTreeWidgetItem *pBankItem = NULL;
// For all soundfonts (in reversed stack order) fill the available banks...
int cSoundFonts = ::fluid_synth_sfcount(m_pSynth);
@@ -151,11 +150,17 @@ void patchesDialog::setup ( fluid_synth_t * pSynth, int iChan,
fluid_sfont_t *pSoundFont = ::fluid_synth_get_sfont(m_pSynth, i);
if (pSoundFont) {
#ifdef CONFIG_FLUID_BANK_OFFSET
- int iBankOffset = ::fluid_synth_get_bank_offset(m_pSynth, pSoundFont->id);
+ int iBankOffset = ::fluid_synth_get_bank_offset(m_pSynth, fluid_sfont_get_id(pSoundFont));
#endif
- pSoundFont->iteration_start(pSoundFont);
- while (pSoundFont->iteration_next(pSoundFont, &preset)) {
- int iBank = preset.get_banknum(&preset);
+ fluid_sfont_iteration_start(pSoundFont);
+#if FLUIDSYNTH_VERSION_MAJOR < 2
+ fluid_preset_t preset;
+ fluid_preset_t *pCurPreset = &preset;
+#else
+ fluid_preset_t *pCurPreset;
+#endif
+ while ((pCurPreset = fluid_sfont_iteration_next_wrapper(pSoundFont, pCurPreset))) {
+ int iBank = fluid_preset_get_banknum(pCurPreset);
#ifdef CONFIG_FLUID_BANK_OFFSET
iBank += iBankOffset;
#endif
@@ -173,9 +178,9 @@ void patchesDialog::setup ( fluid_synth_t * pSynth, int iChan,
m_iBank = 0;
fluid_preset_t *pPreset = ::fluid_synth_get_channel_preset(m_pSynth, m_iChan);
if (pPreset) {
- m_iBank = pPreset->get_banknum(pPreset);
+ m_iBank = fluid_preset_get_banknum(pPreset);
#ifdef CONFIG_FLUID_BANK_OFFSET
- m_iBank += ::fluid_synth_get_bank_offset(m_pSynth, (pPreset->sfont)->id);
+ m_iBank += ::fluid_synth_get_bank_offset(m_pSynth, fluid_sfont_get_id(fluid_preset_get_sfont(sfont)));
#endif
}
@@ -186,7 +191,7 @@ void patchesDialog::setup ( fluid_synth_t * pSynth, int iChan,
// Set the selected program.
if (pPreset)
- m_iProg = pPreset->get_num(pPreset);
+ m_iProg = fluid_preset_get_num(pPreset);
QTreeWidgetItem *pProgItem = findProgItem(m_iProg);
m_progListView->setCurrentItem(pProgItem);
m_progListView->scrollToItem(pProgItem);
@@ -312,7 +317,6 @@ void patchesDialog::bankChanged (void)
// Clear up the program listview.
m_progListView->setSortingEnabled(false);
m_progListView->clear();
- fluid_preset_t preset;
QTreeWidgetItem *pProgItem = NULL;
// For all soundfonts (in reversed stack order) fill the available programs...
int cSoundFonts = ::fluid_synth_sfcount(m_pSynth);
@@ -320,23 +324,29 @@ void patchesDialog::bankChanged (void)
fluid_sfont_t *pSoundFont = ::fluid_synth_get_sfont(m_pSynth, i);
if (pSoundFont) {
#ifdef CONFIG_FLUID_BANK_OFFSET
- int iBankOffset = ::fluid_synth_get_bank_offset(m_pSynth, pSoundFont->id);
+ int iBankOffset = ::fluid_synth_get_bank_offset(m_pSynth, fluid_sfont_get_id(pSoundFont));
+#endif
+ fluid_sfont_iteration_start(pSoundFont);
+#if FLUIDSYNTH_VERSION_MAJOR < 2
+ fluid_preset_t preset;
+ fluid_preset_t *pCurPreset = &preset;
+#else
+ fluid_preset_t *pCurPreset;
#endif
- pSoundFont->iteration_start(pSoundFont);
- while (pSoundFont->iteration_next(pSoundFont, &preset)) {
- int iBank = preset.get_banknum(&preset);
+ while ((pCurPreset = fluid_sfont_iteration_next_wrapper(pSoundFont, pCurPreset))) {
+ int iBank = fluid_preset_get_banknum(pCurPreset);
#ifdef CONFIG_FLUID_BANK_OFFSET
iBank += iBankOffset;
#endif
- int iProg = preset.get_num(&preset);
+ int iProg = fluid_preset_get_num(pCurPreset);
if (iBank == iBankSelected && !findProgItem(iProg)) {
pProgItem = new patchItem(m_progListView, pProgItem);
if (pProgItem) {
pProgItem->setText(0, QString::number(iProg));
- pProgItem->setText(1, preset.get_name(&preset));
- //pProgItem->setText(2, QString::number(pSoundFont->id));
+ pProgItem->setText(1, fluid_preset_get_name(pCurPreset));
+ //pProgItem->setText(2, QString::number(fluid_sfont_get_id(pSoundFont)));
//pProgItem->setText(3, QFileInfo(
- // pSoundFont->get_name(pSoundFont)).baseName());
+ // fluid_sfont_get_name(pSoundFont).baseName());
}
}
}
diff --git a/plugins/sf2_player/patches_dialog.h b/plugins/sf2_player/patches_dialog.h
index f4523ff90..a2c88a79d 100644
--- a/plugins/sf2_player/patches_dialog.h
+++ b/plugins/sf2_player/patches_dialog.h
@@ -29,7 +29,7 @@
#include "ui_patches_dialog.h"
#include "LcdSpinBox.h"
-#include <fluidsynth.h>
+#include "fluidsynthshims.h"
#include <QWidget>
#include <QLabel>
diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp
index 742f5fb8e..40daa77b9 100644
--- a/plugins/sf2_player/sf2_player.cpp
+++ b/plugins/sf2_player/sf2_player.cpp
@@ -85,6 +85,9 @@ QMutex sf2Instrument::s_fontsMutex;
+// The initial values for reverb and chorus are taken from
+// FLUID_REVERB_DEFAULT_ and FLUID_CHORUS_DEFAULT_* macros
+// which are private in FluidSynth 2.0
sf2Instrument::sf2Instrument( InstrumentTrack * _instrument_track ) :
Instrument( _instrument_track, &sf2player_plugin_descriptor ),
m_srcState( NULL ),
@@ -98,15 +101,15 @@ sf2Instrument::sf2Instrument( InstrumentTrack * _instrument_track ) :
m_patchNum( 0, 0, 127, this, tr("Patch") ),
m_gain( 1.0f, 0.0f, 5.0f, 0.01f, this, tr( "Gain" ) ),
m_reverbOn( false, this, tr( "Reverb" ) ),
- m_reverbRoomSize( FLUID_REVERB_DEFAULT_ROOMSIZE, 0, 1.0, 0.01f, this, tr( "Reverb Roomsize" ) ),
- m_reverbDamping( FLUID_REVERB_DEFAULT_DAMP, 0, 1.0, 0.01, this, tr( "Reverb Damping" ) ),
- m_reverbWidth( FLUID_REVERB_DEFAULT_WIDTH, 0, 1.0, 0.01f, this, tr( "Reverb Width" ) ),
- m_reverbLevel( FLUID_REVERB_DEFAULT_LEVEL, 0, 1.0, 0.01f, this, tr( "Reverb Level" ) ),
+ m_reverbRoomSize( 0.2f, 0, 1.0, 0.01f, this, tr( "Reverb Roomsize" ) ),
+ m_reverbDamping( 0.0f, 0, 1.0, 0.01, this, tr( "Reverb Damping" ) ),
+ m_reverbWidth( 0.5f, 0, 1.0, 0.01f, this, tr( "Reverb Width" ) ),
+ m_reverbLevel( 0.9f, 0, 1.0, 0.01f, this, tr( "Reverb Level" ) ),
m_chorusOn( false, this, tr( "Chorus" ) ),
- m_chorusNum( FLUID_CHORUS_DEFAULT_N, 0, 10.0, 1.0, this, tr( "Chorus Lines" ) ),
- m_chorusLevel( FLUID_CHORUS_DEFAULT_LEVEL, 0, 10.0, 0.01, this, tr( "Chorus Level" ) ),
- m_chorusSpeed( FLUID_CHORUS_DEFAULT_SPEED, 0.29, 5.0, 0.01, this, tr( "Chorus Speed" ) ),
- m_chorusDepth( FLUID_CHORUS_DEFAULT_DEPTH, 0, 46.0, 0.05, this, tr( "Chorus Depth" ) )
+ m_chorusNum( 3.0, 0, 10.0, 1.0, this, tr( "Chorus Lines" ) ),
+ m_chorusLevel( 2.0f, 0, 10.0, 0.01, this, tr( "Chorus Level" ) ),
+ m_chorusSpeed( 0.3f, 0.29, 5.0, 0.01, this, tr( "Chorus Speed" ) ),
+ m_chorusDepth( 0.8f, 0, 46.0, 0.05, this, tr( "Chorus Depth" ) )
{
for( int i = 0; i < 128; ++i )
{
@@ -127,6 +130,28 @@ sf2Instrument::sf2Instrument( InstrumentTrack * _instrument_track ) :
// everytime we load a new soundfont.
m_synth = new_fluid_synth( m_settings );
+#if FLUIDSYNTH_VERSION_MAJOR >= 2
+ double settingVal;
+
+ fluid_settings_getnum_default(m_settings, "synth.reverb.room-size", &settingVal);
+ m_reverbRoomSize.setInitValue(settingVal);
+ fluid_settings_getnum_default(m_settings, "synth.reverb.damping", &settingVal);
+ m_reverbDamping.setInitValue(settingVal);
+ fluid_settings_getnum_default(m_settings, "synth.reverb.width", &settingVal);
+ m_reverbWidth.setInitValue(settingVal);
+ fluid_settings_getnum_default(m_settings, "synth.reverb.level", &settingVal);
+ m_reverbLevel.setInitValue(settingVal);
+
+ fluid_settings_getnum_default(m_settings, "synth.chorus.nr", &settingVal);
+ m_chorusNum.setInitValue(settingVal);
+ fluid_settings_getnum_default(m_settings, "synth.chorus.level", &settingVal);
+ m_chorusLevel.setInitValue(settingVal);
+ fluid_settings_getnum_default(m_settings, "synth.chorus.speed", &settingVal);
+ m_chorusSpeed.setInitValue(settingVal);
+ fluid_settings_getnum_default(m_settings, "synth.chorus.depth", &settingVal);
+ m_chorusDepth.setInitValue(settingVal);
+#endif
+
loadFile( ConfigManager::inst()->defaultSoundfont() );
updateSampleRate();
@@ -392,7 +417,6 @@ QString sf2Instrument::getCurrentPatchName()
int iBankSelected = m_bankNum.value();
int iProgSelected = m_patchNum.value();
- fluid_preset_t preset;
// For all soundfonts (in reversed stack order) fill the available programs...
int cSoundFonts = ::fluid_synth_sfcount( m_synth );
for( int i = 0; i < cSoundFonts; i++ )
@@ -403,21 +427,26 @@ QString sf2Instrument::getCurrentPatchName()
#ifdef CONFIG_FLUID_BANK_OFFSET
int iBankOffset =
fluid_synth_get_bank_offset(
- m_synth, pSoundFont->id );
+ m_synth, fluid_sfont_get_id(pSoundFont) );
+#endif
+ fluid_sfont_iteration_start( pSoundFont );
+#if FLUIDSYNTH_VERSION_MAJOR < 2
+ fluid_preset_t preset;
+ fluid_preset_t *pCurPreset = &preset;
+#else
+ fluid_preset_t *pCurPreset;
#endif
- pSoundFont->iteration_start( pSoundFont );
- while( pSoundFont->iteration_next( pSoundFont,
- &preset ) )
+ while ((pCurPreset = fluid_sfont_iteration_next_wrapper(pSoundFont, pCurPreset)))
{
- int iBank = preset.get_banknum( &preset );
+ int iBank = fluid_preset_get_banknum( pCurPreset );
#ifdef CONFIG_FLUID_BANK_OFFSET
iBank += iBankOffset;
#endif
- int iProg = preset.get_num( &preset );
+ int iProg = fluid_preset_get_num( pCurPreset );
if( iBank == iBankSelected && iProg ==
iProgSelected )
{
- return preset.get_name( &preset );
+ return fluid_preset_get_name( pCurPreset );
}
}
}
diff --git a/plugins/sf2_player/sf2_player.h b/plugins/sf2_player/sf2_player.h
index 0d29c27e1..eed7e24ab 100644
--- a/plugins/sf2_player/sf2_player.h
+++ b/plugins/sf2_player/sf2_player.h
@@ -36,7 +36,7 @@
#include "Knob.h"
#include "LcdSpinBox.h"
#include "LedCheckbox.h"
-#include "fluidsynth.h"
+#include "fluidsynthshims.h"
#include "MemoryManager.h"
class sf2InstrumentView;
--
2.14.4

0
recipes-misc/recipes-multimedia/lmms/lmms/0005-carlabase-Do-not-add-RPATH-to-carlabase.patch → recipes-misc/recipes-multimedia/lmms/lmms/0004-carlabase-Do-not-add-RPATH-to-carlabase.patch
View File