From ea914aaa4109b02d721fb913da33bb60ac73a27b Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Wed, 6 Jul 2022 10:04:33 +0100
Subject: [PATCH] Fix build after latest changes

Signed-off-by: falkTX <falktx@falktx.com>
---
 source/backend/engine/CarlaEngineJack.cpp   |  2 +-
 source/backend/engine/CarlaEngineRunner.cpp |  2 +-
 source/plugin/ui_launcher.cpp               | 12 +++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/source/backend/engine/CarlaEngineJack.cpp b/source/backend/engine/CarlaEngineJack.cpp
index d9d4baf67..2f29e93f7 100644
--- a/source/backend/engine/CarlaEngineJack.cpp
+++ b/source/backend/engine/CarlaEngineJack.cpp
@@ -2170,7 +2170,7 @@ public:
             return false;
         }
 
-        const ScopedThreadStopper sts(this);
+        const ScopedRunnerStopper srs(this);
 
         // rename on client client mode, just rename the ports
         if (pData->options.processMode == ENGINE_PROCESS_MODE_SINGLE_CLIENT)
diff --git a/source/backend/engine/CarlaEngineRunner.cpp b/source/backend/engine/CarlaEngineRunner.cpp
index 145cf548f..7fb383c47 100644
--- a/source/backend/engine/CarlaEngineRunner.cpp
+++ b/source/backend/engine/CarlaEngineRunner.cpp
@@ -81,7 +81,7 @@ bool CarlaEngineRunner::run() noexcept
 #endif
 
 #if defined(HAVE_LIBLO) && !defined(BUILD_BRIDGE)
-    if (kIsPlugin)
+    if (fIsPlugin)
         engineOsc.idle();
 #endif
 
diff --git a/source/plugin/ui_launcher.cpp b/source/plugin/ui_launcher.cpp
index eadc7655b..41ae64a8b 100644
--- a/source/plugin/ui_launcher.cpp
+++ b/source/plugin/ui_launcher.cpp
@@ -25,9 +25,9 @@
 
 // --------------------------------------------------------------------------------------------------------------------
 
-START_NAMESPACE_DGL
+START_NAMESPACE_DISTRHO
 
-class PluginApplication : public Application
+class PluginApplication : public DGL_NAMESPACE::Application
 {
 public:
     explicit PluginApplication()
@@ -37,7 +37,7 @@ public:
     }
 };
 
-class PluginWindow : public Window
+class PluginWindow : public DGL_NAMESPACE::Window
 {
 public:
     explicit PluginWindow(PluginApplication& app, const uintptr_t winId)
@@ -69,6 +69,12 @@ public:
     }
 };
 
+END_NAMESPACE_DISTRHO
+
+// --------------------------------------------------------------------------------------------------------------------
+
+START_NAMESPACE_DGL
+
 class CarlaButtonWidget : public TopLevelWidget,
                           private OpenGLImageButton::Callback
 {