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 Carla support for MacOS #4558

Merged
merged 20 commits into from
Sep 15, 2018
Merged

Add Carla support for MacOS #4558

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4d99f7e
Add Carla support for MacOS
tresf Aug 27, 2018
d4d86f1
Update .gitmodules
tresf Aug 27, 2018
d2e3728
Update BuildPlugin.cmake
tresf Aug 27, 2018
0c4ea23
Update CarlaPkgConfig.cmake
tresf Aug 27, 2018
4720ed8
Update CarlaPkgConfig.cmake
tresf Aug 27, 2018
e576229
Move carla to homebrew, remove submodule
tresf Aug 28, 2018
0a7740b
Remove dylib from bundle
tresf Aug 28, 2018
8119462
Fix linking
tresf Aug 28, 2018
5f4af04
Better commenting, fix cmake version detection
tresf Aug 30, 2018
ece0c67
Whitespace removal
tresf Aug 30, 2018
f640b8e
Simplify SHARED linking logic
tresf Aug 30, 2018
73a2add
Don't hard-code carla path
tresf Sep 12, 2018
38e48c0
Nudge to latest Carla
tresf Sep 14, 2018
ee6d502
More scalable relinking
tresf Sep 14, 2018
b38dd02
Add old carla lib fallback
tresf Sep 14, 2018
e89aee5
Bump to homebrew carla; minor formatting
tresf Sep 14, 2018
a5a9a15
Fix header on 1.9.9 and older
tresf Sep 14, 2018
79a5367
Use header definitions if avail
tresf Sep 14, 2018
94c747c
Fix more missing headers
tresf Sep 14, 2018
0838c9b
Uglify :D
tresf Sep 15, 2018
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 .travis/osx..install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ fi

brew install $PACKAGES ccache
# FIXME: Move "carla" to $PACKAGES once https://github.com/Homebrew/homebrew-core/pull/31560 is merged
brew install https://github.com/tresf/homebrew-core/blob/carla/Formula/carla.rb
brew install https://gist.githubusercontent.com/tresf/a8ffb8299227c51cf11aaf3929765264/raw/e94ad17aea63084c66bcb7e90009e3d5e848a467/carla.rb

sudo npm install -g appdmg
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ ENDIF(WANT_TAP)

# check for CARLA
IF(WANT_CARLA)
PKG_CHECK_MODULES(CARLA carla-standalone>=1.9.5)
PKG_CHECK_MODULES(CARLA carla-native-plugin)
PhysSong marked this conversation as resolved.
Show resolved Hide resolved
IF(CARLA_FOUND)
SET(LMMS_HAVE_CARLA TRUE)
SET(STATUS_CARLA "OK")
Expand Down
9 changes: 1 addition & 8 deletions cmake/apple/install_apple.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,7 @@ echo -e "$MSG_COLOR\n\nCreating App Bundle \"$APP\"...$COLOR_RESET"
# Locate macdeployqt, assume homebrew & Qt5
which macdeployqt > /dev/null 2>&1
if [ $? -ne 0 ]; then
brew --prefix qt55 > /dev/null 2>&1
if [ $? -eq 0 ]; then
# Prefer Qt 5.5 (QTBUG-53533)
export PATH=$PATH:$(brew --prefix qt55)/bin
else
# Fallback Qt 5.6+
export PATH=$PATH:$(brew --prefix qt5)/bin
fi
tresf marked this conversation as resolved.
Show resolved Hide resolved
export PATH=$PATH:$(brew --prefix qt)/bin
fi

# Remove any old .app bundles
Expand Down
16 changes: 7 additions & 9 deletions plugins/carlabase/carla.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* carla.cpp - Carla for LMMS
*
* Copyright (C) 2014 Filipe Coelho <[email protected]>
* Copyright (C) 2014-2018 Filipe Coelho <[email protected]>
*
* This file is part of LMMS - https://lmms.io
*
Expand All @@ -24,9 +24,6 @@

#include "carla.h"

#define REAL_BUILD // FIXME this shouldn't be needed
#include "CarlaHost.h"

#include "Engine.h"
#include "Song.h"
#include "gui_templates.h"
Expand Down Expand Up @@ -255,7 +252,7 @@ void CarlaInstrument::handleUiClosed()
emit uiClosed();
}

intptr_t CarlaInstrument::handleDispatcher(const NativeHostDispatcherOpcode opcode, const int32_t index, const intptr_t value, void* const ptr, const float opt)
intptr_t CarlaInstrument::handleDispatcher(const NativeHostDispatcherOpcode opcode, const int32_t, const intptr_t, void* const, const float)
{
intptr_t ret = 0;

Expand All @@ -272,9 +269,6 @@ intptr_t CarlaInstrument::handleDispatcher(const NativeHostDispatcherOpcode opco
}
tresf marked this conversation as resolved.
Show resolved Hide resolved

return ret;

// unused for now
(void)index; (void)value; (void)ptr; (void)opt;
}

// -------------------------------------------------------------------
Expand Down Expand Up @@ -449,10 +443,15 @@ bool CarlaInstrument::handleMidiEvent(const MidiEvent& event, const MidiTime&, f

PluginView* CarlaInstrument::instantiateView(QWidget* parent)
{
// Disable plugin focus per https://bugreports.qt.io/browse/QTBUG-30181
#ifdef CARLA_OS_MAC
tresf marked this conversation as resolved.
Show resolved Hide resolved
fHost.uiParentId = 0;
#else
if (QWidget* const window = parent->window())
fHost.uiParentId = window->winId();
else
fHost.uiParentId = 0;
#endif

std::free((char*)fHost.uiName);

Expand Down Expand Up @@ -532,4 +531,3 @@ void CarlaInstrumentView::timerEvent(QTimerEvent* event)
}

// -------------------------------------------------------------------

7 changes: 4 additions & 3 deletions plugins/carlabase/carla.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* carla.h - Carla for LMMS
*
* Copyright (C) 2014 Filipe Coelho <[email protected]>
* Copyright (C) 2014-2018 Filipe Coelho <[email protected]>
*
* This file is part of LMMS - https://lmms.io
*
Expand All @@ -27,7 +27,8 @@

#include <QtCore/QMutex>

#include "CarlaNative.h"
#define REAL_BUILD // FIXME this shouldn't be needed
#include "CarlaNativePlugin.h"

#include "Instrument.h"
#include "InstrumentView.h"
Expand All @@ -44,7 +45,7 @@ class PLUGIN_EXPORT CarlaInstrument : public Instrument
CarlaInstrument(InstrumentTrack* const instrumentTrack, const Descriptor* const descriptor, const bool isPatchbay);
virtual ~CarlaInstrument();

// CarlaNative functions
// Carla NativeHostDescriptor functions
uint32_t handleGetBufferSize() const;
double handleGetSampleRate() const;
bool handleIsOffline() const;
Expand Down
4 changes: 2 additions & 2 deletions plugins/carlapatchbay/carlapatchbay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* carlapatchbay.cpp - Carla for LMMS (Patchbay)
*
* Copyright (C) 2014 Filipe Coelho <[email protected]>
* Copyright (C) 2014-2018 Filipe Coelho <[email protected]>
*
* This file is part of LMMS - https://lmms.io
*
Expand Down Expand Up @@ -36,7 +36,7 @@ Plugin::Descriptor PLUGIN_EXPORT carlapatchbay_plugin_descriptor =
QT_TRANSLATE_NOOP( "pluginBrowser",
"Carla Patchbay Instrument" ),
"falkTX <falktx/at/falktx.com>",
0x0195,
CARLA_VERSION_HEX,
Plugin::Instrument,
new PluginPixmapLoader( "logo" ),
NULL,
Expand Down
4 changes: 2 additions & 2 deletions plugins/carlarack/carlarack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* carlarack.cpp - Carla for LMMS (Rack)
*
* Copyright (C) 2014 Filipe Coelho <[email protected]>
* Copyright (C) 2014-2018 Filipe Coelho <[email protected]>
*
* This file is part of LMMS - https://lmms.io
*
Expand Down Expand Up @@ -36,7 +36,7 @@ Plugin::Descriptor PLUGIN_EXPORT carlarack_plugin_descriptor =
QT_TRANSLATE_NOOP( "pluginBrowser",
"Carla Rack Instrument" ),
"falkTX <falktx/at/falktx.com>",
0x0195,
CARLA_VERSION_HEX,
Plugin::Instrument,
new PluginPixmapLoader( "logo" ),
NULL,
Expand Down