Hello community, here is the log from the commit of package lmms for openSUSE:Factory checked in at 2018-11-26 10:18:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lmms (Old) and /work/SRC/openSUSE:Factory/.lmms.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lmms" Mon Nov 26 10:18:26 2018 rev:29 rq:646700 version:1.2.0rc7+git20180925.a2685c1cc Changes: -------- --- /work/SRC/openSUSE:Factory/lmms/lmms.changes 2018-08-31 10:43:19.923123079 +0200 +++ /work/SRC/openSUSE:Factory/.lmms.new.19453/lmms.changes 2018-11-26 10:19:29.405790346 +0100 @@ -1,0 +2,73 @@ +Sun Oct 28 11:24:10 UTC 2018 - Edgar Aichinger <edog...@aon.at> + +- add lmms-fluidsynth.patch: backport upstream fix for fluidsynth API change +- remove lmms-1.2.0-undefined_ref.patch, already applied upstream in this release +- add lmms-1.2.0-libdir.patch: upstream patch to find plugin dir (use absolute paths in CMAKE_INSTALL_LIBDIR) +- change lmms-1.2.0-crippled_stk.patch to match current upstream source (tiny datatype change) +- install bash completions, by hand ATM until upstream finds a way to make DESTDIR work + +------------------------------------------------------------------- +Thu Oct 25 08:23:17 UTC 2018 - opensuse-packag...@opensuse.org + +- Update to version 1.2.0rc7+git20180925.a2685c1cc: + * Bump version to 1.2.0-rc7 + * Update the LMMS logo and mimetypes (#4519) + * Add bash completion (#4534) (#4604) + * Specify infinte timeout in tryLock on export + * Update UI 60 times per second (#4570) + * Add Carla support for MacOS (#4558) + * Fallback to default audio/MIDI backends if invalid one is set + * Validate audio/MIDI backend when opening setup dialog + * Restructure help + * Fix decimal separator handling (#4547) + * Set VST program first when restoring settings + * Initialise OLE in RemoteVstPlugin + * Link RemoteVstPlugin with -mwindows + * Fix VST windows resizing a little incorrectly + * Fix kVstTransportChanged flag usage in VST sync + * Fix hang when updateInOutCount called from processReplacing + * Suspend plugin when changing sample rate/buffer size + * Fix invisible editors on project load by validating size (#4502) + * Allow building with sndio support on more systems than just OpenBSD (#4486) + * Remove Qt temporary files after loading ZynAddSubFX settings (#4551) + * Don't try to clear null buffer in NotePlayHandle::play (#4545) + * Make the oscilloscope colors available as properties + * Fix Freeboy noise channel playback (#4538) + * Add CMake 2 support (#4530) + * Fix AppImage shim launcher + * Don't use dummy controllers for connections if not loading projects (#4493) + * Fix some formatting issues in translations (#4482) + * Setup Dialog - Fix bottom of letters cut off (#4483) + * Fix broken MIDI import + * Some demo project license fixes (#4481) + * Use tryLock in audio threads for VST/ZynAddSubFX (#4460) + * Always show sample track panning knobs (#4477) + * Fix occasional audio interface deadlock (#4450) + * Fix fwrite parameter ordering + * Improve STK rawwave path encoding handling + * Fix MIDI import encoding issue on Windows + * Fix WAV exporting on Windows + * Fix sample file loading on Windows + * Fix file name encoding issues with ZynAddSubFX on Windows + * Fix file name encoding issues with VST on Windows + * Fix project URL for some files + * Fix hang on exit from specific MIDI devices + WinMM (#4451) + * CMake: Fix FindSndio module + * CMake: Fix errors when path contains spaces + * Quit exit if failing to save project (#4428) + * LADSPA: Fix undefined reference due to vectorization (#4434) + * Fixup 1bae047b98558981c20c85edc44550f4aa9714d9 + * Fix wrong accelerator character in sv.ts + * Fix crash when loading project with missing peak controller effect (#4391) + * Piano roll: reset editing mode when lost focus (#4393) + * Piano roll: Fix some crashes when no pattern is open (#4392) + * Deselect FX channel's name text when losing focus (#4293) + * Initialize peak controller last sample with base value (#4382) + * Fix automation processing priority + +------------------------------------------------------------------- +Thu Oct 25 08:14:17 UTC 2018 - Edgar Aichinger <edog...@aon.at> + +- update to version 1.2.0rc7 + +------------------------------------------------------------------- Old: ---- lmms-1.2.0-undefined_ref.patch lmms-1.2.0rc6+git20180601.1349d45d7.tar.xz New: ---- lmms-1.2.0-libdir.patch lmms-1.2.0rc7+git20180925.a2685c1cc.tar.xz lmms-fluidsynth.patch lmms.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lmms.spec ++++++ --- /var/tmp/diff_new_pack.CSh7yA/_old 2018-11-26 10:19:30.601788949 +0100 +++ /var/tmp/diff_new_pack.CSh7yA/_new 2018-11-26 10:19:30.605788944 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,7 +21,7 @@ %bcond_without carla %bcond_without crippled_stk Name: lmms -Version: 1.2.0rc6+git20180601.1349d45d7 +Version: 1.2.0rc7+git20180925.a2685c1cc Release: 0 Summary: Linux MultiMedia Studio License: GPL-2.0-or-later @@ -32,8 +32,12 @@ Patch0: lmms-1.1.0-return.patch # PATCH-FIX-OPENSUSE Some parts cannot be build because stk misses some files due to legal issues (bnc#761147) Patch1: lmms-1.2.0-crippled_stk.patch -# PATCH-FIX-UPSTREAM Fix undefined references due to vectorization, backport from git (gh#LMMS/lmms#4434) -Patch2: lmms-1.2.0-undefined_ref.patch +# PATCH-FIX-UPSTREAM Fix fluidsynth sf2 player compilation, backport from git (gh#LMMS/lmms#4678) +Patch2: lmms-fluidsynth.patch +# PATCH-FIX-UPSTREAM Fix plugin library search path, testing an upstream proposal +Patch3: lmms-1.2.0-libdir.patch + +BuildRequires: bash-completion BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -46,6 +50,7 @@ BuildRequires: libqt5-qttools BuildRequires: libstk-devel BuildRequires: pkgconfig +BuildRequires: sndio-devel BuildRequires: wine BuildRequires: wine-devel BuildRequires: wine-devel-32bit @@ -100,11 +105,13 @@ %patch1 -p1 %endif %patch2 -p1 +%patch3 -p1 %build %cmake \ -DWANT_QT5=ON \ -DCMAKE_SHARED_LINKER_FLAGS="" \ + -DCMAKE_SKIP_RPATH=OFF \ -Wno-dev %make_jobs @@ -113,6 +120,10 @@ mkdir -p '%{buildroot}%{_defaultdocdir}/lmms/' # remove unneeded static helper library from install rm %{buildroot}%{_libdir}/libqx11embedcontainer.a +# workaround: copy bash completion manually into install dir because it fails during cmake install +mkdir -p %{buildroot}/%{_datadir}/bash-completion/completions +cp %{_builddir}/lmms*/doc/bash-completion/lmms %{buildroot}/%{_datadir}/bash-completion/completions/lmms + %fdupes -s %{buildroot}/%{_datadir} %files @@ -123,8 +134,9 @@ %{_libdir}/lmms/ %{_datadir}/lmms/ %{_datadir}/applications/lmms.desktop -%{_datadir}/icons/hicolor/scalable/* +%{_datadir}/icons/hicolor/* %{_datadir}/mime/packages/lmms.xml +%{_datadir}/bash-completion/completions/lmms %files devel %defattr(0644,root,root,0755) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.CSh7yA/_old 2018-11-26 10:19:30.629788916 +0100 +++ /var/tmp/diff_new_pack.CSh7yA/_new 2018-11-26 10:19:30.629788916 +0100 @@ -5,8 +5,8 @@ <param name="submodules">enable</param> <param name="exclude">.git</param> <param name="filename">lmms</param> - <param name="versionformat">1.2.0rc6+git%cd.%h</param> - <param name="revision">1349d45</param> + <param name="versionformat">1.2.0rc7+git%cd.%h</param> + <param name="revision">a2685c1</param> <param name="changesgenerate">enable</param> </service> <service name="tar" mode="disabled"> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.CSh7yA/_old 2018-11-26 10:19:30.653788888 +0100 +++ /var/tmp/diff_new_pack.CSh7yA/_new 2018-11-26 10:19:30.653788888 +0100 @@ -5,9 +5,9 @@ </service> <service name="tar_scm"> <param name="url">https://github.com/LMMS/lmms.git</param> - <param name="changesrevision">1349d45d72d74b83d30cdf8a092b51e2e1b73afe</param></service> + <param name="changesrevision">a2685c1cca3ef20e317d69eccb915f9d7b05e349</param></service> <service name="recompress"> <param name="file">lmms-*.tar</param> <param name="compression">xz</param> </service> -</servicedata> +</servicedata> \ No newline at end of file ++++++ lmms-1.2.0-crippled_stk.patch ++++++ --- /var/tmp/diff_new_pack.CSh7yA/_old 2018-11-26 10:19:30.661788879 +0100 +++ /var/tmp/diff_new_pack.CSh7yA/_new 2018-11-26 10:19:30.665788874 +0100 @@ -191,7 +191,7 @@ - { - Stk::setSampleRate( _sample_rate ); - Stk::setRawwavePath( QDir( ConfigManager::inst()->stkDir() ).absolutePath() -- .toLatin1().constData() ); +- .toLocal8Bit().constData() ); -#ifndef LMMS_DEBUG - Stk::showWarnings( false ); -#endif ++++++ lmms-1.2.0-libdir.patch ++++++ diff -up lmms/cmake/modules/DetectMachine.cmake.orig lmms/cmake/modules/DetectMachine.cmake --- lmms/cmake/modules/DetectMachine.cmake.orig 2018-08-06 08:43:43.000000000 +0200 +++ lmms/cmake/modules/DetectMachine.cmake 2018-10-30 17:32:32.385021508 +0100 @@ -42,6 +42,13 @@ ENDIF(IS_X86) IF(CMAKE_INSTALL_LIBDIR) SET(LIB_DIR "${CMAKE_INSTALL_LIBDIR}") + # Make LIB_DIR relative + STRING(FIND "${LIB_DIR}" "${CMAKE_INSTALL_PREFIX}" PREFIX_IDX) + IF(PREFIX_IDX EQUAL 0) + STRING(LENGTH "${CMAKE_INSTALL_PREFIX}" PREFIX_LEN) + STRING(SUBSTRING "${LIB_DIR}" ${PREFIX_LEN} -1 LIB_DIR) + STRING(REGEX REPLACE "^[/\\]" "" LIB_DIR "${LIB_DIR}") + ENDIF() ELSE(CMAKE_INSTALL_LIBDIR) SET(LIB_DIR lib) ENDIF(CMAKE_INSTALL_LIBDIR) ++++++ lmms-1.2.0rc6+git20180601.1349d45d7.tar.xz -> lmms-1.2.0rc7+git20180925.a2685c1cc.tar.xz ++++++ /work/SRC/openSUSE:Factory/lmms/lmms-1.2.0rc6+git20180601.1349d45d7.tar.xz /work/SRC/openSUSE:Factory/.lmms.new.19453/lmms-1.2.0rc7+git20180925.a2685c1cc.tar.xz differ: char 26, line 1 ++++++ lmms-fluidsynth.patch ++++++ diff -urN lmms-1.2.0-rc7-orig/plugins/sf2_player/fluidsynthshims.h lmms-1.2.0-rc7/plugins/sf2_player/fluidsynthshims.h --- lmms-1.2.0-rc7-orig/plugins/sf2_player/fluidsynthshims.h 1970-01-01 01:00:00.000000000 +0100 +++ lmms-1.2.0-rc7/plugins/sf2_player/fluidsynthshims.h 2018-10-28 11:24:22.000000000 +0100 @@ -0,0 +1,88 @@ +/* + * fluidsynthshims.h - a shim header for FluidSynth 2.0 API changes + * + * Copyright (c) 2018 Hyunjin Song <tteu.in...@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 + +#define FLUID_REVERB_DEFAULT_ROOMSIZE 0.2f +#define FLUID_REVERB_DEFAULT_DAMP 0.0f +#define FLUID_REVERB_DEFAULT_WIDTH 0.5f +#define FLUID_REVERB_DEFAULT_LEVEL 0.9f + +#define FLUID_CHORUS_DEFAULT_N 3 +#define FLUID_CHORUS_DEFAULT_LEVEL 2.0f +#define FLUID_CHORUS_DEFAULT_SPEED 0.3f +#define FLUID_CHORUS_DEFAULT_DEPTH 8.0f + +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 -urN lmms-1.2.0-rc7-orig/plugins/sf2_player/patches_dialog.cpp lmms-1.2.0-rc7/plugins/sf2_player/patches_dialog.cpp --- lmms-1.2.0-rc7-orig/plugins/sf2_player/patches_dialog.cpp 2018-10-28 11:18:47.000000000 +0100 +++ lmms-1.2.0-rc7/plugins/sf2_player/patches_dialog.cpp 2018-10-28 11:24:22.000000000 +0100 @@ -143,7 +143,6 @@ 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 @@ 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 @@ 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 @@ // 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 @@ // 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 @@ 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 -urN lmms-1.2.0-rc7-orig/plugins/sf2_player/patches_dialog.h lmms-1.2.0-rc7/plugins/sf2_player/patches_dialog.h --- lmms-1.2.0-rc7-orig/plugins/sf2_player/patches_dialog.h 2018-10-28 11:18:47.000000000 +0100 +++ lmms-1.2.0-rc7/plugins/sf2_player/patches_dialog.h 2018-10-28 11:24:22.000000000 +0100 @@ -29,7 +29,7 @@ #include "ui_patches_dialog.h" #include "LcdSpinBox.h" -#include <fluidsynth.h> +#include "fluidsynthshims.h" #include <QWidget> #include <QLabel> diff -urN lmms-1.2.0-rc7-orig/plugins/sf2_player/sf2_player.cpp lmms-1.2.0-rc7/plugins/sf2_player/sf2_player.cpp --- lmms-1.2.0-rc7-orig/plugins/sf2_player/sf2_player.cpp 2018-10-28 11:18:47.000000000 +0100 +++ lmms-1.2.0-rc7/plugins/sf2_player/sf2_player.cpp 2018-10-28 11:24:22.000000000 +0100 @@ -127,6 +127,29 @@ // everytime we load a new soundfont. m_synth = new_fluid_synth( m_settings ); +#if FLUIDSYNTH_VERSION_MAJOR >= 2 + // Get the default values from the setting + 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 +415,6 @@ 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 +425,26 @@ #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 -urN lmms-1.2.0-rc7-orig/plugins/sf2_player/sf2_player.h lmms-1.2.0-rc7/plugins/sf2_player/sf2_player.h --- lmms-1.2.0-rc7-orig/plugins/sf2_player/sf2_player.h 2018-10-28 11:18:47.000000000 +0100 +++ lmms-1.2.0-rc7/plugins/sf2_player/sf2_player.h 2018-10-28 11:24:22.000000000 +0100 @@ -36,7 +36,7 @@ #include "Knob.h" #include "LcdSpinBox.h" #include "LedCheckbox.h" -#include "fluidsynth.h" +#include "fluidsynthshims.h" #include "MemoryManager.h" class sf2InstrumentView; ++++++ lmms.obsinfo ++++++ name: lmms version: 1.2.0rc7+git20180925.a2685c1cc mtime: 1537861671 commit: a2685c1cca3ef20e317d69eccb915f9d7b05e349
