Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add lv2 packages to Mac CI #5532

Merged
merged 3 commits into from
Sep 24, 2020
Merged

Add lv2 packages to Mac CI #5532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b26317
Add lv2 packages to macOS CI
JohannesLorenz Jun 11, 2020
0215af9
Add missing include
JohannesLorenz Sep 24, 2020
2e295a3
Move or remove unused slots
JohannesLorenz Sep 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .travis/osx..install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions include/Lv2UridMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
#include <mutex> // TODO: use semaphore, even though this is not realtime critical
#include <string>
#include <unordered_map>
#include <vector>

Expand Down
7 changes: 0 additions & 7 deletions plugins/Lv2Instrument/Lv2Instrument.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,6 @@ void Lv2InsView::dropEvent(QDropEvent *_de)



void Lv2InsView::toggleUI()
{
}




void Lv2InsView::modelChanged()
{
Lv2ViewBase::modelChanged(castModel<Lv2Instrument>());
Expand Down
4 changes: 0 additions & 4 deletions plugins/Lv2Instrument/Lv2Instrument.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down
7 changes: 7 additions & 0 deletions src/gui/Lv2ViewBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,13 @@ Lv2ViewBase::~Lv2ViewBase() {



void Lv2ViewBase::toggleUI()
{
}




void Lv2ViewBase::toggleHelp(bool visible)
{
if (m_helpWindow)
Expand Down