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

Fix build

tags/1.9.4
falkTX 10 years ago
parent
c0675071c3
commit
ce9eaedb4a
7 changed files with 26 additions and 13 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -0
      source/backend/engine/CarlaEngine.cpp
  2. +3
    -2
      source/backend/engine/CarlaEngineBridge.cpp
  3. +1
    -0
      source/backend/engine/CarlaEngineInternal.hpp
  4. +7
    -10
      source/backend/plugin/CarlaPlugin.cpp
  5. +10
    -0
      source/backend/plugin/CsoundPlugin.cpp
  6. +1
    -0
      source/bridges/CarlaBridgePlugin.cpp
  7. +3
    -1
      source/bridges/Makefile

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

@@ -29,6 +29,7 @@
#include "CarlaPlugin.hpp"

#include "CarlaBackendUtils.hpp"
#include "CarlaEngineUtils.hpp"
#include "CarlaStateUtils.hpp"

#include <cmath>


+ 3
- 2
source/backend/engine/CarlaEngineBridge.cpp View File

@@ -20,11 +20,12 @@
#endif

#include "CarlaEngineInternal.hpp"
#include "CarlaBackendUtils.hpp"
#include "CarlaMIDI.h"
#include "CarlaPlugin.hpp"

#include "CarlaBackendUtils.hpp"
#include "CarlaBridgeUtils.hpp"
#include "CarlaShmUtils.hpp"
#include "CarlaMIDI.h"

#include "jackbridge/JackBridge.hpp"



+ 1
- 0
source/backend/engine/CarlaEngineInternal.hpp View File

@@ -23,6 +23,7 @@
#include "CarlaEngineThread.hpp"

#include "CarlaMutex.hpp"
#include "LinkedList.hpp"

// -----------------------------------------------------------------------
// Engine helper macro, sets lastError and returns false/NULL


+ 7
- 10
source/backend/plugin/CarlaPlugin.cpp View File

@@ -59,9 +59,9 @@ struct ParamSymbol {

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

CarlaPlugin* CarlaPlugin::newGIG(const Initializer& init, const bool use16Outs)
CarlaPlugin* CarlaPlugin::newFileGIG(const Initializer& init, const bool use16Outs)
{
carla_debug("CarlaPlugin::newGIG({%p, \"%s\", \"%s\", \"%s\"}, %s)", init.engine, init.filename, init.name, init.label, bool2str(use16Outs));
carla_debug("CarlaPlugin::newFileGIG({%p, \"%s\", \"%s\", \"%s\"}, %s)", init.engine, init.filename, init.name, init.label, bool2str(use16Outs));
#ifdef WANT_LINUXSAMPLER
return newLinuxSampler(init, "GIG", use16Outs);
#else
@@ -73,9 +73,9 @@ CarlaPlugin* CarlaPlugin::newGIG(const Initializer& init, const bool use16Outs)
#endif
}

CarlaPlugin* CarlaPlugin::newSF2(const Initializer& init, const bool use16Outs)
CarlaPlugin* CarlaPlugin::newFileSF2(const Initializer& init, const bool use16Outs)
{
carla_debug("CarlaPlugin::newSF2({%p, \"%s\", \"%s\", \"%s\"}, %s)", init.engine, init.filename, init.name, init.label, bool2str(use16Outs));
carla_debug("CarlaPlugin::newFileSF2({%p, \"%s\", \"%s\", \"%s\"}, %s)", init.engine, init.filename, init.name, init.label, bool2str(use16Outs));
#if defined(WANT_FLUIDSYNTH)
return newFluidSynth(init, use16Outs);
#elif defined(WANT_LINUXSAMPLER)
@@ -89,17 +89,14 @@ CarlaPlugin* CarlaPlugin::newSF2(const Initializer& init, const bool use16Outs)
#endif
}

CarlaPlugin* CarlaPlugin::newSFZ(const Initializer& init, const bool use16Outs)
CarlaPlugin* CarlaPlugin::newFileSFZ(const Initializer& init)
{
carla_debug("CarlaPlugin::newSFZ({%p, \"%s\", \"%s\", \"%s\"}, %s)", init.engine, init.filename, init.name, init.label, bool2str(use16Outs));
carla_debug("CarlaPlugin::newFileSFZ({%p, \"%s\", \"%s\", \"%s\"})", init.engine, init.filename, init.name, init.label);
#ifdef WANT_LINUXSAMPLER
return newLinuxSampler(init, "SFZ", use16Outs);
return newLinuxSampler(init, "SFZ", false);
#else
init.engine->setLastError("SFZ support not available");
return nullptr;

// unused
(void)use16Outs;
#endif
}



+ 10
- 0
source/backend/plugin/CsoundPlugin.cpp View File

@@ -79,6 +79,8 @@ CARLA_BACKEND_END_NAMESPACE

#endif

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

CARLA_BACKEND_START_NAMESPACE

CarlaPlugin* CarlaPlugin::newCsound(const Initializer& init)
@@ -110,4 +112,12 @@ CarlaPlugin* CarlaPlugin::newCsound(const Initializer& init)
#endif
}

CarlaPlugin* CarlaPlugin::newFileCSD(const Initializer& init)
{
carla_debug("CarlaPlugin::newFileCSD({%p, \"%s\", \"%s\", \"%s\"})", init.engine, init.filename, init.name, init.label);
return newCsound(init);
}

CARLA_BACKEND_END_NAMESPACE

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

+ 1
- 0
source/bridges/CarlaBridgePlugin.cpp View File

@@ -23,6 +23,7 @@

#include "CarlaBackendUtils.hpp"
#include "CarlaBridgeUtils.hpp"
#include "CarlaMIDI.h"

//#include "juce_core.h"



+ 3
- 1
source/bridges/Makefile View File

@@ -368,6 +368,7 @@ OBJS_NATIVE = CarlaBridgePlugin__native.o \
# carla-engine
OBJS_NATIVE += \
../backend/engine/CarlaEngine__native.o \
../backend/engine/CarlaEngineInternal__native.o \
../backend/engine/CarlaEngineOsc__native.o \
../backend/engine/CarlaEngineThread__native.o \
../backend/engine/CarlaEngineJack__native.o \
@@ -376,6 +377,7 @@ OBJS_NATIVE += \
# carla-plugin
OBJS_NATIVE += \
../backend/plugin/CarlaPlugin__native.o \
../backend/plugin/CarlaPluginInternal__native.o \
../backend/plugin/CarlaPluginThread__native.o \
../backend/plugin/NativePlugin__native.o \
../backend/plugin/LadspaPlugin__native.o \
@@ -383,8 +385,8 @@ OBJS_NATIVE += \
../backend/plugin/Lv2Plugin__native.o \
../backend/plugin/VstPlugin__native.o \
../backend/plugin/AuPlugin__native.o \
../backend/plugin/JucePlugin__native.o \
../backend/plugin/CsoundPlugin__native.o \
../backend/plugin/JucePlugin__native.o \
../backend/plugin/FluidSynthPlugin__native.o \
../backend/plugin/LinuxSamplerPlugin__native.o



Write Preview
Loading…
Cancel
Save