falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 42 Activity
Browse Source

CarlaPlugin renames; fix standalone build

tags/1.9.4
falkTX 11 years ago
parent
13de76d321
commit
5b3a4df9c0
20 changed files with 42 additions and 39 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -2
      source/backend/engine/CarlaEngine.cpp
  2. +1
    -1
      source/backend/native/bypass.c
  3. +1
    -1
      source/backend/native/distrho-3bandeq.cpp
  4. +1
    -1
      source/backend/native/distrho-3bandsplitter.cpp
  5. +1
    -1
      source/backend/native/distrho-pingpongpan.cpp
  6. +2
    -2
      source/backend/native/midi-split.c
  7. +2
    -2
      source/backend/native/midi-through.c
  8. +4
    -3
      source/backend/native/zynaddsubfx.cpp
  9. +6
    -2
      source/backend/plugin/CarlaBridge.cpp
  10. +1
    -0
      source/backend/plugin/CarlaPluginInternal.hpp
  11. +1
    -1
      source/backend/plugin/CarlaPluginThread.cpp
  12. +1
    -1
      source/backend/plugin/CarlaPluginThread.hpp
  13. +1
    -1
      source/backend/plugin/DssiPlugin.cpp
  14. +1
    -1
      source/backend/plugin/FluidSynthPlugin.cpp
  15. +2
    -2
      source/backend/plugin/LadspaPlugin.cpp
  16. +1
    -1
      source/backend/plugin/LinuxSamplerPlugin.cpp
  17. +1
    -1
      source/backend/plugin/Lv2Plugin.cpp
  18. +12
    -12
      source/backend/plugin/Makefile
  19. +1
    -2
      source/backend/plugin/NativePlugin.cpp
  20. +2
    -2
      source/backend/plugin/VstPlugin.cpp

+ 0
- 2
source/backend/engine/CarlaEngine.cpp View File

@@ -1093,12 +1093,10 @@ void CarlaEngine::waitForProccessEnd()

#ifndef BUILD_BRIDGE

#if 0
const QProcessEnvironment& CarlaEngine::getOptionsAsProcessEnvironment() const
{
return kData->procEnv;
}
#endif

#define CARLA_ENGINE_SET_OPTION_RUNNING_CHECK \
if (isRunning()) \


+ 1
- 1
source/backend/native/bypass.c View File

@@ -15,7 +15,7 @@
* For a full copy of the GNU General Public License see the GPL.txt file
*/

#include "carla_native.h"
#include "CarlaNative.h"

static PluginHandle bypass_instantiate(const PluginDescriptor* _this_, HostDescriptor* host)
{


+ 1
- 1
source/backend/native/distrho-3bandeq.cpp View File

@@ -15,7 +15,7 @@
* For a full copy of the GNU General Public License see the GPL.txt file
*/

#include "carla_native.hpp"
#include "CarlaNative.hpp"

// Plugin Code
#include "3bandeq/DistrhoArtwork3BandEQ.cpp"


+ 1
- 1
source/backend/native/distrho-3bandsplitter.cpp View File

@@ -15,7 +15,7 @@
* For a full copy of the GNU General Public License see the GPL.txt file
*/

#include "carla_native.hpp"
#include "CarlaNative.hpp"

// Plugin Code
#include "3bandsplitter/DistrhoArtwork3BandSplitter.cpp"


+ 1
- 1
source/backend/native/distrho-pingpongpan.cpp View File

@@ -15,7 +15,7 @@
* For a full copy of the GNU General Public License see the GPL.txt file
*/

#include "carla_native.hpp"
#include "CarlaNative.hpp"

// Plugin Code
#include "pingpongpan/DistrhoArtworkPingPongPan.cpp"


+ 2
- 2
source/backend/native/midi-split.c View File

@@ -15,8 +15,8 @@
* For a full copy of the GNU General Public License see the GPL.txt file
*/

#include "carla_native.h"
#include "carla_midi.h"
#include "CarlaNative.h"
#include "CarlaMIDI.h"

#include <stdlib.h>



+ 2
- 2
source/backend/native/midi-through.c View File

@@ -15,8 +15,8 @@
* For a full copy of the GNU General Public License see the GPL.txt file
*/

#include "carla_native.h"
#include "carla_midi.h"
#include "CarlaNative.h"
#include "CarlaMIDI.h"

#include <stdlib.h>



+ 4
- 3
source/backend/native/zynaddsubfx.cpp View File

@@ -19,8 +19,9 @@
#define __STDC_LIMIT_MACROS
#include <cstdint>

#include "carla_native.hpp"
#include "carla_midi.h"
#include "CarlaNative.hpp"
#include "CarlaMIDI.h"
#include "CarlaString.hpp"

#include "zynaddsubfx/Misc/Master.h"
#include "zynaddsubfx/Misc/Util.h"
@@ -180,7 +181,7 @@ protected:
return;

// unused, TODO
Q_UNUSED(value);
(void)value;
}

void setMidiProgram(const uint32_t bank, const uint32_t program)


+ 6
- 2
source/backend/plugin/CarlaBridge.cpp View File

@@ -247,14 +247,16 @@ public:
*type = GUI_NONE;
*resizable = false;
}
#endif

// -------------------------------------------------------------------
// Set data (internal stuff)

int setOscBridgeInfo(const PluginBridgeInfoType type, const int argc, const lo_arg* const* const argv, const char* const types)
int setOscPluginBridgeInfo(const PluginBridgeInfoType type, const int argc, const lo_arg* const* const argv, const char* const types)
{
qDebug("setOscBridgeInfo(%i, %i, %p, \"%s\")", type, argc, argv, types);
qDebug("setOscPluginBridgeInfo(%i, %i, %p, \"%s\")", type, argc, argv, types);

#if 0
switch (type)
{
case PluginBridgeAudioCount:
@@ -739,10 +741,12 @@ public:
break;
}
}
#endif

return 0;
}

#if 0
// -------------------------------------------------------------------
// Set data (plugin-specific stuff)



+ 1
- 0
source/backend/plugin/CarlaPluginInternal.hpp View File

@@ -23,6 +23,7 @@
#include "CarlaEngine.hpp"
#include "CarlaOscUtils.hpp"
#include "CarlaStateUtils.hpp"
#include "CarlaMutex.hpp"
#include "CarlaMIDI.h"

#include "RtList.hpp"


+ 1
- 1
source/backend/plugin/CarlaPluginThread.cpp View File

@@ -15,7 +15,7 @@
* For a full copy of the GNU General Public License see the GPL.txt file
*/

#include "carla_plugin_internal.hpp"
#include "CarlaPluginInternal.hpp"

#include <QtCore/QProcess>



+ 1
- 1
source/backend/plugin/CarlaPluginThread.hpp View File

@@ -18,7 +18,7 @@
#ifndef __CARLA_PLUGIN_THREAD_HPP__
#define __CARLA_PLUGIN_THREAD_HPP__

#include "carla_backend_utils.hpp"
#include "CarlaBackendUtils.hpp"

#include <QtCore/QThread>



+ 1
- 1
source/backend/plugin/DssiPlugin.cpp View File

@@ -19,7 +19,7 @@

#ifdef WANT_DSSI

#include "carla_ladspa_utils.hpp"
#include "CarlaLadspaUtils.hpp"
#include "dssi/dssi.h"

CARLA_BACKEND_START_NAMESPACE


+ 1
- 1
source/backend/plugin/FluidSynthPlugin.cpp View File

@@ -15,7 +15,7 @@
* For a full copy of the GNU General Public License see the GPL.txt file
*/

#include "carla_plugin_internal.hpp"
#include "CarlaPluginInternal.hpp"

#ifdef WANT_FLUIDSYNTH



+ 2
- 2
source/backend/plugin/LadspaPlugin.cpp View File

@@ -15,11 +15,11 @@
* For a full copy of the GNU General Public License see the GPL.txt file
*/

#include "carla_plugin_internal.hpp"
#include "CarlaPluginInternal.hpp"

#ifdef WANT_LADSPA

#include "carla_ladspa_utils.hpp"
#include "CarlaLadspaUtils.hpp"

CARLA_BACKEND_START_NAMESPACE



+ 1
- 1
source/backend/plugin/LinuxSamplerPlugin.cpp View File

@@ -17,7 +17,7 @@

// TODO - setMidiProgram()

#include "carla_plugin_internal.hpp"
#include "CarlaPluginInternal.hpp"

#ifdef WANT_LINUXSAMPLER



+ 1
- 1
source/backend/plugin/Lv2Plugin.cpp View File

@@ -15,7 +15,7 @@
* For a full copy of the GNU General Public License see the GPL.txt file
*/

#include "carla_plugin_internal.hpp"
#include "CarlaPluginInternal.hpp"

#ifdef WANT_LV2



+ 12
- 12
source/backend/plugin/Makefile View File

@@ -8,8 +8,8 @@ include ../Makefile.mk

# --------------------------------------------------------------

BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo QtGui)
LINK_FLAGS += $(shell pkg-config --libs liblo QtGui)
BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo QtCore QtGui)
LINK_FLAGS += $(shell pkg-config --libs liblo QtCore QtGui)

ifeq ($(HAVE_SUIL),true)
BUILD_CXX_FLAGS += $(shell pkg-config --cflags suil-0)
@@ -29,16 +29,16 @@ endif
# --------------------------------------------------------------

OBJS = \
carla_plugin.cpp.o \
carla_plugin_thread.cpp.o \
carla_bridge.cpp.o \
native.cpp.o \
ladspa.cpp.o \
dssi.cpp.o \
lv2.cpp.o \
vst.cpp.o \
fluidsynth.cpp.o \
linuxsampler.cpp.o
CarlaPlugin.cpp.o \
CarlaPluginThread.cpp.o \
CarlaBridge.cpp.o \
NativePlugin.cpp.o \
LadspaPlugin.cpp.o \
DssiPlugin.cpp.o \
Lv2Plugin.cpp.o \
VstPlugin.cpp.o \
FluidSynthPlugin.cpp.o \
LinuxSamplerPlugin.cpp.o

SHARED = ../libcarla_plugin.so
STATIC = ../libcarla_plugin.a


+ 1
- 2
source/backend/plugin/NativePlugin.cpp View File

@@ -15,8 +15,7 @@
* For a full copy of the GNU General Public License see the GPL.txt file
*/

#include "carla_plugin_internal.hpp"
#include "carla_native.h"
#include "CarlaPluginInternal.hpp"

CARLA_BACKEND_START_NAMESPACE



+ 2
- 2
source/backend/plugin/VstPlugin.cpp View File

@@ -15,11 +15,11 @@
* For a full copy of the GNU General Public License see the GPL.txt file
*/

#include "carla_plugin_internal.hpp"
#include "CarlaPluginInternal.hpp"

#ifdef WANT_VST

#include "carla_vst_utils.hpp"
#include "CarlaVstUtils.hpp"

#ifdef Q_WS_X11
# include <QtGui/QX11Info>


Write Preview
Loading…
Cancel
Save