Browse Source

Fix build

tags/1.9.4
falkTX 11 years ago
parent
commit
a8d295f485
6 changed files with 10 additions and 70 deletions
  1. +1
    -1
      source/backend/engine/CarlaEngine_patchbay.cpp
  2. +2
    -2
      source/backend/plugin/CarlaPluginInternal.cpp
  3. +4
    -66
      source/backend/plugin/CarlaPluginInternal.hpp
  4. +1
    -1
      source/backend/plugin/LadspaPlugin.cpp
  5. +1
    -0
      source/backend/plugin/Makefile
  6. +1
    -0
      source/backend/standalone/CarlaStandalone.cpp

+ 1
- 1
source/backend/engine/CarlaEngine_patchbay.cpp View File

@@ -146,7 +146,7 @@ EnginePatchbayBuffers::~EnginePatchbayBuffers()
clear();
}

void clear()
void EnginePatchbayBuffers::clear()
{
}



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

@@ -106,9 +106,9 @@ void CarlaPluginProtectedData::postponeRtEvent(const PluginPostRtEventType type,

static LibCounter sLibCounter;

void* CarlaPluginProtectedData::libError(const char* const filename)
const char* CarlaPluginProtectedData::libError(const char* const filename)
{
lib_error(lib, filename);
return lib_error(filename);
}

bool CarlaPluginProtectedData::libOpen(const char* const filename)


+ 4
- 66
source/backend/plugin/CarlaPluginInternal.hpp View File

@@ -786,81 +786,19 @@ struct CarlaPluginProtectedData {
// -------------------------------------------------------------------
// Buffer functions

void clearBuffers()
{
if (latencyBuffers != nullptr)
{
CARLA_ASSERT(audioIn.count > 0);

for (uint32_t i=0; i < audioIn.count; ++i)
{
CARLA_SAFE_ASSERT_CONTINUE(latencyBuffers[i] != nullptr);

delete[] latencyBuffers[i];
latencyBuffers[i] = nullptr;
}

delete[] latencyBuffers;
latencyBuffers = nullptr;
latency = 0;
}
else
{
CARLA_ASSERT(latency == 0);
}

audioIn.clear();
audioOut.clear();
param.clear();
event.clear();
}
void clearBuffers();

void recreateLatencyBuffers()
{
if (latencyBuffers != nullptr)
{
CARLA_ASSERT(audioIn.count > 0);

for (uint32_t i=0; i < audioIn.count; ++i)
{
CARLA_SAFE_ASSERT_CONTINUE(latencyBuffers[i] != nullptr);

delete[] latencyBuffers[i];
latencyBuffers[i] = nullptr;
}

delete[] latencyBuffers;
latencyBuffers = nullptr;
}

if (audioIn.count > 0 && latency > 0)
{
latencyBuffers = new float*[audioIn.count];

for (uint32_t i=0; i < audioIn.count; ++i)
{
latencyBuffers[i] = new float[latency];
FLOAT_CLEAR(latencyBuffers[i], latency);
}
}
}
void recreateLatencyBuffers();

// -------------------------------------------------------------------
// Post-poned events

void postponeRtEvent(const PluginPostRtEventType type, const int32_t value1, const int32_t value2, const float value3)
{
CARLA_SAFE_ASSERT_RETURN(type != kPluginPostRtEventNull,);

PluginPostRtEvent event = { type, value1, value2, value3 };

postRtEvents.appendRT(event);
}
void postponeRtEvent(const PluginPostRtEventType type, const int32_t value1, const int32_t value2, const float value3);

// -------------------------------------------------------------------
// Library functions, see CarlaPlugin.cpp

void libError(const char* const filename);
const char* libError(const char* const filename);

bool libOpen(const char* const filename);
bool libClose();


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

@@ -1373,7 +1373,7 @@ public:

if (! pData->libOpen(filename))
{
pData->engine->setLastError(lib_error(filename));
pData->engine->setLastError(pData->libError(filename));
return false;
}



+ 1
- 0
source/backend/plugin/Makefile View File

@@ -10,6 +10,7 @@ include ../Makefile.mk

OBJS = \
CarlaPlugin.cpp.o \
CarlaPluginInternal.cpp.o \
CarlaPluginThread.cpp.o \
BridgePlugin.cpp.o \
NativePlugin.cpp.o \


+ 1
- 0
source/backend/standalone/CarlaStandalone.cpp View File

@@ -19,6 +19,7 @@
// Check carla_stderr2("Engine is not running"); <= prepend func name and args

#include "CarlaHost.h"
#include "CarlaMIDI.h"
#include "CarlaNative.h"

#include "CarlaEngine.hpp"


Loading…
Cancel
Save