Browse Source

Fix internal jack client for new main-thread-idle behaviour

Signed-off-by: falkTX <falktx@falktx.com>
pull/1723/head
falkTX 2 years ago
parent
commit
a67681efe3
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 6 additions and 1 deletions
  1. +2
    -1
      source/backend/engine/CarlaEngine.cpp
  2. +4
    -0
      source/backend/engine/CarlaEngineJack.cpp

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

@@ -445,6 +445,7 @@ void CarlaEngine::idle() noexcept
CARLA_SAFE_ASSERT_RETURN(getType() != kEngineTypePlugin,); CARLA_SAFE_ASSERT_RETURN(getType() != kEngineTypePlugin,);


const bool engineNotRunning = !isRunning(); const bool engineNotRunning = !isRunning();
const bool engineHasIdleOnMainThread = hasIdleOnMainThread();


for (uint i=0; i < pData->curPluginCount; ++i) for (uint i=0; i < pData->curPluginCount; ++i)
{ {
@@ -469,7 +470,7 @@ void CarlaEngine::idle() noexcept
} }
else else
{ {
if (hints & PLUGIN_NEEDS_MAIN_THREAD_IDLE)
if (engineHasIdleOnMainThread && (hints & PLUGIN_NEEDS_MAIN_THREAD_IDLE) != 0)
{ {
try { try {
plugin->idle(); plugin->idle();


+ 4
- 0
source/backend/engine/CarlaEngineJack.cpp View File

@@ -1731,7 +1731,11 @@ public:


bool hasIdleOnMainThread() const noexcept override bool hasIdleOnMainThread() const noexcept override
{ {
#ifndef BUILD_BRIDGE
return !fIsInternalClient;
#else
return true; return true;
#endif
} }


bool isRunning() const noexcept override bool isRunning() const noexcept override


Loading…
Cancel
Save