Browse Source

Fix bridge build

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.2.0-RC1
falkTX 4 years ago
parent
commit
90a868aba6
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 7 additions and 4 deletions
  1. +3
    -1
      source/backend/engine/CarlaEngineClient.cpp
  2. +2
    -1
      source/backend/engine/CarlaEngineInternal.cpp
  3. +2
    -2
      source/backend/engine/CarlaEngineJack.cpp

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

@@ -111,7 +111,9 @@ CarlaEngineClient::ProtectedData::ProtectedData(const CarlaEngine& eng) noexcept
CarlaEngineClient::ProtectedData::~ProtectedData()
{
carla_debug("CarlaEngineClient::ProtectedData::~ProtectedData()");
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
CARLA_SAFE_ASSERT(plugin == nullptr);
#endif
}

void CarlaEngineClient::ProtectedData::addAudioPortName(const bool isInput, const char* const name)
@@ -197,8 +199,8 @@ void CarlaEngineClient::deactivate(const bool willClose) noexcept
{
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
pData->cvSourcePorts.setGraphAndPlugin(nullptr, nullptr);
#endif
pData->plugin = nullptr;
#endif
}
}



+ 2
- 1
source/backend/engine/CarlaEngineInternal.cpp View File

@@ -413,7 +413,8 @@ CarlaEngine::ProtectedData::ProtectedData(CarlaEngine* const engine)
nextAction()
{
#ifdef BUILD_BRIDGE_ALTERNATIVE_ARCH
carla_zeroStructs(plugins, 1);
plugins[0].plugin = nullptr;
carla_zeroStructs(plugins[0].peaks, 1);
#endif
}



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

@@ -927,13 +927,13 @@ public:
} catch(...) {}
}

#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
if (willClose)
{
fCVSourcePorts.setGraphAndPlugin(nullptr, nullptr);
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
fReservedPluginPtr = nullptr;
#endif
}
#endif

CarlaEngineClient::deactivate(willClose);
}


Loading…
Cancel
Save