Skip to content

Use new carla-native-plugin library #4593

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

Closed
falkTX wants to merge 1 commit into from
Closed

Use new carla-native-plugin library #4593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,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)
IF(CARLA_FOUND)
SET(LMMS_HAVE_CARLA TRUE)
SET(STATUS_CARLA "OK")
Expand Down
12 changes: 3 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 - http://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 @@ -245,19 +242,19 @@ 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;

switch (opcode)
{
case NATIVE_HOST_OPCODE_NULL:
break;
case NATIVE_HOST_OPCODE_UPDATE_PARAMETER:
case NATIVE_HOST_OPCODE_UPDATE_MIDI_PROGRAM:
case NATIVE_HOST_OPCODE_RELOAD_PARAMETERS:
case NATIVE_HOST_OPCODE_RELOAD_MIDI_PROGRAMS:
case NATIVE_HOST_OPCODE_RELOAD_ALL:
case NATIVE_HOST_OPCODE_INTERNAL_PLUGIN:
// nothing
break;
case NATIVE_HOST_OPCODE_UI_UNAVAILABLE:
Expand All @@ -269,9 +266,6 @@ intptr_t CarlaInstrument::handleDispatcher(const NativeHostDispatcherOpcode opco
}

return ret;

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

// -------------------------------------------------------------------
Expand Down
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 - http://lmms.io
*
Expand All @@ -25,7 +25,8 @@
#ifndef CARLA_H
#define CARLA_H

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

#include "Instrument.h"
#include "InstrumentView.h"
Expand All @@ -42,7 +43,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 - http://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 - http://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