Browse Source

Avoid assertion warning with an expected null value

tags/v2.1-rc2
falkTX 5 years ago
parent
commit
ed852ffac7
5 changed files with 10 additions and 4 deletions
  1. +1
    -1
      source/backend/engine/CarlaEngineClient.cpp
  2. +2
    -2
      source/backend/engine/CarlaEngineClient.hpp
  3. +5
    -0
      source/backend/engine/CarlaEngineGraph.cpp
  4. +1
    -0
      source/backend/engine/CarlaEngineInternal.hpp
  5. +1
    -1
      source/backend/engine/CarlaEngineJack.cpp

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

@@ -260,7 +260,7 @@ bool CarlaEngineClient::removePort(const EnginePortType portType, const char* co
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH #ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
CarlaEngineCVSourcePorts* CarlaEngineClient::createCVSourcePorts() CarlaEngineCVSourcePorts* CarlaEngineClient::createCVSourcePorts()
{ {
pData->cvSourcePorts.setGraphAndPlugin(pData->egraph.getPatchbayGraph(), pData->plugin);
pData->cvSourcePorts.setGraphAndPlugin(pData->egraph.getPatchbayGraphOrNull(), pData->plugin);
return &pData->cvSourcePorts; return &pData->cvSourcePorts;
} }
#endif #endif


+ 2
- 2
source/backend/engine/CarlaEngineClient.hpp View File

@@ -81,9 +81,9 @@ public:
} }


protected: protected:
inline PatchbayGraph* getPatchbayGraph() const noexcept
inline PatchbayGraph* getPatchbayGraphOrNull() const noexcept
{ {
return pData->egraph.getPatchbayGraph();
return pData->egraph.getPatchbayGraphOrNull();
} }


inline CarlaPlugin* getPlugin() const noexcept inline CarlaPlugin* getPlugin() const noexcept


+ 5
- 0
source/backend/engine/CarlaEngineGraph.cpp View File

@@ -2490,6 +2490,11 @@ PatchbayGraph* EngineInternalGraph::getPatchbayGraph() const noexcept
return fPatchbay; return fPatchbay;
} }


PatchbayGraph* EngineInternalGraph::getPatchbayGraphOrNull() const noexcept
{
return fIsRack ? nullptr : fPatchbay;
}

void EngineInternalGraph::process(CarlaEngine::ProtectedData* const data, const float* const* const inBuf, float* const* const outBuf, const uint32_t frames) void EngineInternalGraph::process(CarlaEngine::ProtectedData* const data, const float* const* const inBuf, float* const* const outBuf, const uint32_t frames)
{ {
if (fIsRack) if (fIsRack)


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

@@ -88,6 +88,7 @@ public:


RackGraph* getRackGraph() const noexcept; RackGraph* getRackGraph() const noexcept;
PatchbayGraph* getPatchbayGraph() const noexcept; PatchbayGraph* getPatchbayGraph() const noexcept;
PatchbayGraph* getPatchbayGraphOrNull() const noexcept;


void process(CarlaEngine::ProtectedData* data, const float* const* inBuf, float* const* outBuf, uint32_t frames); void process(CarlaEngine::ProtectedData* data, const float* const* inBuf, float* const* outBuf, uint32_t frames);




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

@@ -885,7 +885,7 @@ public:
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH #ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
CarlaEngineCVSourcePorts* createCVSourcePorts() override CarlaEngineCVSourcePorts* createCVSourcePorts() override
{ {
fCVSourcePorts.setGraphAndPlugin(getPatchbayGraph(), getPlugin());
fCVSourcePorts.setGraphAndPlugin(getPatchbayGraphOrNull(), getPlugin());
return &fCVSourcePorts; return &fCVSourcePorts;
} }




Loading…
Cancel
Save