From ca15445429d7ff872fd40db23e24840cc6b90436 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 5 Jul 2022 09:53:19 +0100 Subject: [PATCH] One more build fix Signed-off-by: falkTX --- source/backend/CarlaStandalone.cpp | 2 ++ source/backend/engine/CarlaEngineJack.cpp | 2 +- source/bridges-plugin/Makefile | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/source/backend/CarlaStandalone.cpp b/source/backend/CarlaStandalone.cpp index 46d29b465..ec6f29744 100644 --- a/source/backend/CarlaStandalone.cpp +++ b/source/backend/CarlaStandalone.cpp @@ -979,11 +979,13 @@ void carla_set_engine_option(CarlaHostHandle handle, EngineOption option, int va break; #endif +#ifndef BUILD_BRIDGE case CB::ENGINE_OPTION_DEBUG_CONSOLE_OUTPUT: #ifdef CARLA_CAN_USE_LOG_THREAD shandle.logThreadEnabled = (value != 0); #endif break; +#endif case CB::ENGINE_OPTION_CLIENT_NAME_PREFIX: if (shandle.engineOptions.clientNamePrefix != nullptr) diff --git a/source/backend/engine/CarlaEngineJack.cpp b/source/backend/engine/CarlaEngineJack.cpp index 46358c6e2..d9d4baf67 100644 --- a/source/backend/engine/CarlaEngineJack.cpp +++ b/source/backend/engine/CarlaEngineJack.cpp @@ -3503,7 +3503,7 @@ protected: } } - pData->thread.stopThread(500); + pData->runner.stopRunner(); fClient = nullptr; #ifdef BUILD_BRIDGE diff --git a/source/bridges-plugin/Makefile b/source/bridges-plugin/Makefile index e763911c9..ccfbf4464 100644 --- a/source/bridges-plugin/Makefile +++ b/source/bridges-plugin/Makefile @@ -205,7 +205,7 @@ OBJS_native = \ $(OBJDIR)/CarlaEngineNative.cpp.o \ $(OBJDIR)/CarlaEngineOscSend.cpp.o \ $(OBJDIR)/CarlaEnginePorts.cpp.o \ - $(OBJDIR)/CarlaEngineThread.cpp.o \ + $(OBJDIR)/CarlaEngineRunner.cpp.o \ $(OBJDIR)/CarlaEngineJack.cpp.o \ $(OBJDIR)/CarlaEngineBridge.cpp.o \ $(OBJDIR)/CarlaPlugin.cpp.o \ @@ -234,7 +234,7 @@ OBJS_arch = \ $(OBJDIR)/CarlaEngineData.cpp.arch.o \ $(OBJDIR)/CarlaEngineInternal.cpp.arch.o \ $(OBJDIR)/CarlaEnginePorts.cpp.arch.o \ - $(OBJDIR)/CarlaEngineThread.cpp.arch.o \ + $(OBJDIR)/CarlaEngineRunner.cpp.arch.o \ $(OBJDIR)/CarlaEngineJack.cpp.arch.o \ $(OBJDIR)/CarlaEngineBridge.cpp.arch.o \ $(OBJDIR)/CarlaPlugin.cpp.arch.o \