From ab90229583670b26a4d489b5deee50fe7e4b813f Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Fri, 2 Apr 2021 14:34:58 +0100
Subject: [PATCH] VST:  Pulled Linux SharedMessageThread out into its own file

---
 .../VST/juce_VST_Wrapper.cpp                  | 42 +----------
 .../utility/juce_LinuxMessageThread.h         | 71 +++++++++++++++++++
 2 files changed, 72 insertions(+), 41 deletions(-)
 create mode 100644 modules/juce_audio_plugin_client/utility/juce_LinuxMessageThread.h

diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
index 4d69526737..4a01ec0b01 100644
--- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
@@ -105,6 +105,7 @@ using namespace juce;
 
 #include "../utility/juce_FakeMouseMoveGenerator.h"
 #include "../utility/juce_WindowsHooks.h"
+#include "../utility/juce_LinuxMessageThread.h"
 
 #include <juce_audio_processors/format_types/juce_LegacyAudioParameter.cpp>
 #include <juce_audio_processors/format_types/juce_VSTCommon.h>
@@ -187,47 +188,6 @@ namespace
     static bool messageThreadIsDefinitelyCorrect = false;
 }
 
-//==============================================================================
-#elif JUCE_LINUX || JUCE_BSD
-
-struct SharedMessageThread  : public Thread
-{
-    SharedMessageThread()  : Thread ("VstMessageThread")
-    {
-        startThread (7);
-
-        while (! initialised)
-            sleep (1);
-    }
-
-    ~SharedMessageThread() override
-    {
-        signalThreadShouldExit();
-        JUCEApplicationBase::quit();
-        waitForThreadToExit (5000);
-        clearSingletonInstance();
-    }
-
-    void run() override
-    {
-        initialiseJuce_GUI();
-        initialised = true;
-
-        MessageManager::getInstance()->setCurrentThreadAsMessageThread();
-
-        XWindowSystem::getInstance();
-
-        while ((! threadShouldExit()) && MessageManager::getInstance()->runDispatchLoopUntil (250))
-        {}
-    }
-
-    JUCE_DECLARE_SINGLETON (SharedMessageThread, false)
-
-    bool initialised = false;
-};
-
-JUCE_IMPLEMENT_SINGLETON (SharedMessageThread)
-
 #endif
 
 static Array<void*> activePlugins;
diff --git a/modules/juce_audio_plugin_client/utility/juce_LinuxMessageThread.h b/modules/juce_audio_plugin_client/utility/juce_LinuxMessageThread.h
new file mode 100644
index 0000000000..327c0f4854
--- /dev/null
+++ b/modules/juce_audio_plugin_client/utility/juce_LinuxMessageThread.h
@@ -0,0 +1,71 @@
+/*
+  ==============================================================================
+
+   This file is part of the JUCE library.
+   Copyright (c) 2020 - Raw Material Software Limited
+
+   JUCE is an open source library subject to commercial or open-source
+   licensing.
+
+   By using JUCE, you agree to the terms of both the JUCE 6 End-User License
+   Agreement and JUCE Privacy Policy (both effective as of the 16th June 2020).
+
+   End User License Agreement: www.juce.com/juce-6-licence
+   Privacy Policy: www.juce.com/juce-privacy-policy
+
+   Or: You may also use this code under the terms of the GPL v3 (see
+   www.gnu.org/licenses).
+
+   JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
+   EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
+   DISCLAIMED.
+
+  ==============================================================================
+*/
+
+#if JUCE_LINUX || JUCE_BSD
+
+namespace juce
+{
+
+struct SharedMessageThread  : public Thread
+{
+    SharedMessageThread()  : Thread ("VstMessageThread")
+    {
+        startThread (7);
+
+        while (! initialised)
+            sleep (1);
+    }
+
+    ~SharedMessageThread() override
+    {
+        signalThreadShouldExit();
+        JUCEApplicationBase::quit();
+        waitForThreadToExit (5000);
+        clearSingletonInstance();
+    }
+
+    void run() override
+    {
+        initialiseJuce_GUI();
+        initialised = true;
+
+        MessageManager::getInstance()->setCurrentThreadAsMessageThread();
+
+        XWindowSystem::getInstance();
+
+        while ((! threadShouldExit()) && MessageManager::getInstance()->runDispatchLoopUntil (250))
+        {}
+    }
+
+    JUCE_DECLARE_SINGLETON (SharedMessageThread, false)
+
+    bool initialised = false;
+};
+
+JUCE_IMPLEMENT_SINGLETON (SharedMessageThread)
+
+} // namespace juce
+
+#endif