Browse Source

Misc

tags/1.9.4
falkTX 10 years ago
parent
commit
6815c7797a
3 changed files with 20 additions and 16 deletions
  1. +12
    -12
      source/backend/engine/CarlaEngineJack.cpp
  2. +1
    -1
      source/backend/engine/CarlaEngineJuce.cpp
  3. +7
    -3
      source/backend/engine/CarlaEngineNative.cpp

+ 12
- 12
source/backend/engine/CarlaEngineJack.cpp View File

@@ -90,7 +90,7 @@ public:
fBuffer = (float*)jackbridge_port_get_buffer(fPort, bufferSize); fBuffer = (float*)jackbridge_port_get_buffer(fPort, bufferSize);


if (! fIsInput) if (! fIsInput)
FLOAT_CLEAR(fBuffer, bufferSize);
FLOAT_CLEAR(fBuffer, bufferSize);
} }


private: private:
@@ -151,7 +151,7 @@ public:
fBuffer = (float*)jackbridge_port_get_buffer(fPort, bufferSize); fBuffer = (float*)jackbridge_port_get_buffer(fPort, bufferSize);


if (! fIsInput) if (! fIsInput)
FLOAT_CLEAR(fBuffer, bufferSize);
FLOAT_CLEAR(fBuffer, bufferSize);
} }


private: private:
@@ -550,7 +550,7 @@ public:
unsigned int ret = 0; unsigned int ret = 0;


try { try {
ret = static_cast<unsigned int>(jackbridge_client_name_size());
ret = static_cast<unsigned int>(jackbridge_client_name_size());
} }
catch (...) {} catch (...) {}


@@ -567,7 +567,7 @@ public:
unsigned int ret = 0; unsigned int ret = 0;


try { try {
ret = static_cast<unsigned int>(jackbridge_port_name_size());
ret = static_cast<unsigned int>(jackbridge_port_name_size());
} }
catch (...) {} catch (...) {}


@@ -583,7 +583,7 @@ public:
bool init(const char* const clientName) override bool init(const char* const clientName) override
{ {
carla_debug("CarlaEngineJack::init(\"%s\")", clientName); carla_debug("CarlaEngineJack::init(\"%s\")", clientName);
CARLA_ENGINE_THREAD_SAFE_SECTION
CARLA_ENGINE_THREAD_SAFE_SECTION;


fFreewheel = false; fFreewheel = false;
fTransportState = JackTransportStopped; fTransportState = JackTransportStopped;
@@ -671,7 +671,7 @@ public:
bool close() override bool close() override
{ {
carla_debug("CarlaEngineJack::close()"); carla_debug("CarlaEngineJack::close()");
CARLA_ENGINE_THREAD_SAFE_SECTION
CARLA_ENGINE_THREAD_SAFE_SECTION;


CarlaEngine::close(); CarlaEngine::close();


@@ -718,7 +718,7 @@ public:
#ifndef BUILD_BRIDGE #ifndef BUILD_BRIDGE
void idle() override void idle() override
{ {
CARLA_ENGINE_THREAD_SAFE_SECTION
CARLA_ENGINE_THREAD_SAFE_SECTION;


CarlaEngine::idle(); CarlaEngine::idle();


@@ -771,7 +771,7 @@ public:


CarlaEngineClient* addClient(CarlaPlugin* const plugin) override CarlaEngineClient* addClient(CarlaPlugin* const plugin) override
{ {
CARLA_ENGINE_THREAD_SAFE_SECTION
CARLA_ENGINE_THREAD_SAFE_SECTION;


jack_client_t* client = nullptr; jack_client_t* client = nullptr;


@@ -815,7 +815,7 @@ public:
CARLA_SAFE_ASSERT_RETURN(id < pData->curPluginCount, nullptr); CARLA_SAFE_ASSERT_RETURN(id < pData->curPluginCount, nullptr);
CARLA_SAFE_ASSERT_RETURN(pData->plugins != nullptr, nullptr); CARLA_SAFE_ASSERT_RETURN(pData->plugins != nullptr, nullptr);
CARLA_SAFE_ASSERT_RETURN(newName != nullptr && newName[0] != '\0', nullptr); CARLA_SAFE_ASSERT_RETURN(newName != nullptr && newName[0] != '\0', nullptr);
CARLA_ENGINE_THREAD_SAFE_SECTION
CARLA_ENGINE_THREAD_SAFE_SECTION;


CarlaPlugin* const plugin(pData->plugins[id].plugin); CarlaPlugin* const plugin(pData->plugins[id].plugin);


@@ -895,7 +895,7 @@ public:
bool patchbayConnect(int portA, int portB) override bool patchbayConnect(int portA, int portB) override
{ {
CARLA_SAFE_ASSERT_RETURN(fClient != nullptr, false); CARLA_SAFE_ASSERT_RETURN(fClient != nullptr, false);
CARLA_ENGINE_THREAD_SAFE_SECTION
CARLA_ENGINE_THREAD_SAFE_SECTION;


if (fClient == nullptr) if (fClient == nullptr)
{ {
@@ -920,7 +920,7 @@ public:
bool patchbayDisconnect(uint connectionId) override bool patchbayDisconnect(uint connectionId) override
{ {
CARLA_SAFE_ASSERT_RETURN(fClient != nullptr, false); CARLA_SAFE_ASSERT_RETURN(fClient != nullptr, false);
CARLA_ENGINE_THREAD_SAFE_SECTION
CARLA_ENGINE_THREAD_SAFE_SECTION;


for (LinkedList<ConnectionToId>::Itenerator it = fUsedConnections.begin(); it.valid(); it.next()) for (LinkedList<ConnectionToId>::Itenerator it = fUsedConnections.begin(); it.valid(); it.next())
{ {
@@ -951,7 +951,7 @@ public:
bool patchbayRefresh() override bool patchbayRefresh() override
{ {
CARLA_SAFE_ASSERT_RETURN(fClient != nullptr, false); CARLA_SAFE_ASSERT_RETURN(fClient != nullptr, false);
CARLA_ENGINE_THREAD_SAFE_SECTION
CARLA_ENGINE_THREAD_SAFE_SECTION;


fLastGroupId = 0; fLastGroupId = 0;
fLastPortId = 0; fLastPortId = 0;


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

@@ -458,7 +458,7 @@ protected:
else else
{ {
pData->processRackFull(const_cast<float**>(inputChannelData), static_cast<uint32_t>(numInputChannels), pData->processRackFull(const_cast<float**>(inputChannelData), static_cast<uint32_t>(numInputChannels),
outputChannelData, static_cast<uint32_t>(numOutputChannels),
outputChannelData, static_cast<uint32_t>(numOutputChannels),
static_cast<uint32_t>(numSamples), false); static_cast<uint32_t>(numSamples), false);
} }




+ 7
- 3
source/backend/engine/CarlaEngineNative.cpp View File

@@ -39,6 +39,10 @@


CARLA_BACKEND_START_NAMESPACE CARLA_BACKEND_START_NAMESPACE


#if 0
} // Fix editor indentation
#endif

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


class CarlaEngineNativeUI : public CarlaPipeServer class CarlaEngineNativeUI : public CarlaPipeServer
@@ -953,7 +957,7 @@ protected:
uint32_t getMidiProgramCount() const uint32_t getMidiProgramCount() const
{ {
if (CarlaPlugin* const plugin = _getFirstPlugin()) if (CarlaPlugin* const plugin = _getFirstPlugin())
return plugin->getMidiProgramCount();
return plugin->getMidiProgramCount();


return 0; return 0;
} }
@@ -1318,7 +1322,7 @@ protected:
SaveState saveState; SaveState saveState;
fillSaveStateFromXmlNode(saveState, node); fillSaveStateFromXmlNode(saveState, node);


CARLA_SAFE_ASSERT_CONTINUE(saveState.type != nullptr)
CARLA_SAFE_ASSERT_CONTINUE(saveState.type != nullptr);


const void* extraStuff = nullptr; const void* extraStuff = nullptr;


@@ -1599,7 +1603,7 @@ void carla_register_native_plugin_carla();


void carla_register_native_plugin_carla() void carla_register_native_plugin_carla()
{ {
CARLA_BACKEND_USE_NAMESPACE
CARLA_BACKEND_USE_NAMESPACE;
carla_register_native_plugin(&carlaRackDesc); carla_register_native_plugin(&carlaRackDesc);
#if 0 //def HAVE_JUCE #if 0 //def HAVE_JUCE
carla_register_native_plugin(&carlaPatchbayDesc); carla_register_native_plugin(&carlaPatchbayDesc);


Loading…
Cancel
Save