From 9b26317d4626b1ea28bbec43d9ecc2f8ef865847 Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Thu, 11 Jun 2020 08:19:44 +0200 Subject: [PATCH 1/3] Add lv2 packages to macOS CI --- .circleci/config.yml | 2 +- .travis/osx..install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fe5b1f2fd7c..408fef721a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,7 +181,7 @@ jobs: command: | # uninstall Homebrew's python 2 to prevent errors on brew install brew uninstall python@2 || true - brew update && brew install ccache fftw cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio fltk qt5 carla + brew update && brew install ccache fftw cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio lilv lv2 stk fluid-synth portaudio fltk qt5 carla - run: name: Install nodejs dependencies command: npm install -g appdmg diff --git a/.travis/osx..install.sh b/.travis/osx..install.sh index 93d478c40f4..42bf66acab4 100755 --- a/.travis/osx..install.sh +++ b/.travis/osx..install.sh @@ -2,7 +2,7 @@ set -e -PACKAGES="cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio node fltk qt carla" +PACKAGES="cmake pkg-config libogg libvorbis lame libsndfile libsamplerate lilv lv2 jack sdl libgig libsoundio stk fluid-synth portaudio node fltk qt carla" if "${TRAVIS}"; then PACKAGES="$PACKAGES ccache" From 0215af9f39ca5878e01af2206de4eec315652e7a Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Thu, 24 Sep 2020 09:45:31 +0200 Subject: [PATCH 2/3] Add missing include --- include/Lv2UridMap.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/Lv2UridMap.h b/include/Lv2UridMap.h index f1ddb6253b7..39cfcc44fb2 100644 --- a/include/Lv2UridMap.h +++ b/include/Lv2UridMap.h @@ -31,6 +31,7 @@ #include #include // TODO: use semaphore, even though this is not realtime critical +#include #include #include From 2e295a397ef1ce406a852c6d46e130eaf47e1e1e Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Thu, 24 Sep 2020 10:18:50 +0200 Subject: [PATCH 3/3] Move or remove unused slots --- plugins/Lv2Instrument/Lv2Instrument.cpp | 7 ------- plugins/Lv2Instrument/Lv2Instrument.h | 4 ---- src/gui/Lv2ViewBase.cpp | 7 +++++++ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/plugins/Lv2Instrument/Lv2Instrument.cpp b/plugins/Lv2Instrument/Lv2Instrument.cpp index 0f7534ac8c9..d5ba48787fb 100644 --- a/plugins/Lv2Instrument/Lv2Instrument.cpp +++ b/plugins/Lv2Instrument/Lv2Instrument.cpp @@ -271,13 +271,6 @@ void Lv2InsView::dropEvent(QDropEvent *_de) -void Lv2InsView::toggleUI() -{ -} - - - - void Lv2InsView::modelChanged() { Lv2ViewBase::modelChanged(castModel()); diff --git a/plugins/Lv2Instrument/Lv2Instrument.h b/plugins/Lv2Instrument/Lv2Instrument.h index 6451d49cdcf..4fb2e1e34c3 100644 --- a/plugins/Lv2Instrument/Lv2Instrument.h +++ b/plugins/Lv2Instrument/Lv2Instrument.h @@ -111,10 +111,6 @@ class Lv2InsView : public InstrumentView, public Lv2ViewBase void dragEnterEvent(QDragEnterEvent *_dee) override; void dropEvent(QDropEvent *_de) override; -private slots: - void reloadPlugin(); - void toggleUI(); - private: void modelChanged() override; }; diff --git a/src/gui/Lv2ViewBase.cpp b/src/gui/Lv2ViewBase.cpp index 9b9217e48b2..488705bcb66 100644 --- a/src/gui/Lv2ViewBase.cpp +++ b/src/gui/Lv2ViewBase.cpp @@ -202,6 +202,13 @@ Lv2ViewBase::~Lv2ViewBase() { +void Lv2ViewBase::toggleUI() +{ +} + + + + void Lv2ViewBase::toggleHelp(bool visible) { if (m_helpWindow)