Start of multi-instance details

Signed-off-by: falkTX <[email protected]>
mod-audio · Mar 14, 2024 · 3a1b689 · 3a1b689
1 parent eb09b71
commit 3a1b689
Show file tree

Hide file tree

Showing 16 changed files with 206 additions and 82 deletions.
diff --git a/src/DPF b/src/DPF
diff --git a/src/mod-host b/src/mod-host
diff --git a/src/mod-ui b/src/mod-ui
diff --git a/src/plugin/DesktopAudioDriver.cpp b/src/plugin/DesktopAudioDriver.cpp
@@ -13,12 +13,14 @@
 # include <fcntl.h>
 # include <sys/mman.h>
 # ifdef __APPLE__
+#  include <dispatch/dispatch.h>
 #  include <mach/mach.h>
 #  include <mach/semaphore.h>
 #  include <servers/bootstrap.h>
 # else
 #  include <cerrno>
 #  include <syscall.h>
+#  include <sys/prctl.h>
 #  include <sys/time.h>
 #  include <linux/futex.h>
 # endif
@@ -29,6 +31,33 @@ namespace Jack
 
 // -----------------------------------------------------------------------------------------------------------
 
+#ifdef __APPLE__
+static void terminateHandler(void*)
+{
+    printf("Desktop driver parent has died, terminating ourselves now\n");
+    fflush(stdout);
+    kill(getpid(), SIGTERM);
+}
+#endif
+
+static void terminateOnParentExit() noexcept
+{
+#if defined(__APPLE__)
+    const dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_PROC,
+                                                            getppid(),
+                                                            DISPATCH_PROC_EXIT,
+                                                            nullptr);
+
+    dispatch_source_set_event_handler_f(source, terminateHandler);
+
+    dispatch_resume(source);
+#elif !defined(_WIN32)
+    prctl(PR_SET_PDEATHSIG, SIGTERM);
+#endif
+}
+
+// -----------------------------------------------------------------------------------------------------------
+
 class DesktopAudioDriver : public JackAudioDriver
 {
     struct Data {
@@ -516,6 +545,7 @@ SERVER_EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLocke
     if (driver->Open(period, rate, true, true, 2, 2, false, "", "", 0, 0) == 0)
     {
         printf("%03d:%s OK\n", __LINE__, __FUNCTION__);
+        Jack::terminateOnParentExit();
         return driver;
     }
 

diff --git a/src/plugin/DesktopPlugin.cpp b/src/plugin/DesktopPlugin.cpp
@@ -25,6 +25,7 @@ class DesktopPlugin : public Plugin,
     float* tmpBuffers[2] = {};
     uint32_t numFramesInShmBuffer = 0;
     uint32_t numFramesInTmpBuffer = 0;
+    uint portBaseNum = 0;
 
    #ifdef DISTRHO_OS_WINDOWS
     const WCHAR* envp;
@@ -40,7 +41,10 @@ class DesktopPlugin : public Plugin,
         if (isDummyInstance())
             return;
 
-        envp = getEvironment();
+        // TODO check available ports
+        portBaseNum = 1;
+
+        envp = getEvironment(portBaseNum);
 
         if (shm.init() && run())
             startRunner(500);
@@ -91,15 +95,15 @@ class DesktopPlugin : public Plugin,
             const String appDir(getAppDir());
             const String jackdStr(appDir + DISTRHO_OS_SEP_STR "jackd" APP_EXT);
             const String jacksessionStr(appDir + DISTRHO_OS_SEP_STR "jack" DISTRHO_OS_SEP_STR "jack-session.conf");
+            const String servernameStr("mod-desktop-" + String(portBaseNum));
             const String sampleRateStr(static_cast<int>(getSampleRate()));
 
             const char* const jackd_args[] = {
                 jackdStr.buffer(),
                 "-R",
                 "-S",
-                "-n", "mod-desktop",
-                "-C",
-                jacksessionStr.buffer(),
+                "-n", servernameStr.buffer(),
+                "-C", jacksessionStr.buffer(),
                 "-d", "desktop",
                 "-r", sampleRateStr.buffer(),
                 nullptr
@@ -129,7 +133,7 @@ class DesktopPlugin : public Plugin,
             return mod_ui.start(mod_ui_args, envp);
         }
 
-        parameters[kParameterBasePortNumber] = 1;
+        parameters[kParameterBasePortNumber] = portBaseNum;
         return true;
     }
 

diff --git a/src/plugin/DesktopUI.cpp b/src/plugin/DesktopUI.cpp
@@ -19,6 +19,7 @@ class DesktopUI : public UI,
     Button buttonOpenWebGui;
     Button buttonOpenUserFilesDir;
     String label;
+    uint port = 0;
     void* webview = nullptr;
 
 public:
@@ -54,8 +55,6 @@ class DesktopUI : public UI,
         label += getPluginFormatName();
         label += " v" VERSION;
 
-        webview = addWebView(getWindow().getNativeWindowHandle());
-
         if (d_isNotEqual(scaleFactor, 1.0))
         {
             setGeometryConstraints((DISTRHO_UI_DEFAULT_WIDTH - 100) * scaleFactor,
@@ -70,7 +69,8 @@ class DesktopUI : public UI,
 
     ~DesktopUI() override
     {
-        destroyWebView(webview);
+        if (webview != nullptr)
+            destroyWebView(webview);
     }
 
 protected:
@@ -85,8 +85,17 @@ class DesktopUI : public UI,
     {
         if (index == kParameterBasePortNumber)
         {
-            // TODO set port
-            reloadWebView(webview);
+            if (webview != nullptr)
+            {
+                destroyWebView(webview);
+                webview = nullptr;
+            }
+
+            port = d_roundToUnsignedInt(value);
+            DISTRHO_SAFE_ASSERT_RETURN(port != 0,);
+
+            port += kPortNumOffset;
+            webview = addWebView(getWindow().getNativeWindowHandle(), port);
         }
     }
 
@@ -120,10 +129,11 @@ class DesktopUI : public UI,
         switch (widget->getId())
         {
         case 1:
-            reloadWebView(webview);
+            if (webview != nullptr)
+                reloadWebView(webview);
             break;
         case 2:
-            openWebGui();
+            openWebGui(port);
             break;
         case 3:
             openUserFilesDir();
@@ -135,6 +145,9 @@ class DesktopUI : public UI,
     {
         UI::onResize(ev);
 
+        if (webview == nullptr)
+            return;
+
         const double scaleFactor = getScaleFactor();
 
         uint offset = kVerticalOffset * scaleFactor;

diff --git a/src/plugin/DistrhoPluginInfo.h b/src/plugin/DistrhoPluginInfo.h
@@ -25,6 +25,7 @@
 #define DISTRHO_UI_USER_RESIZABLE       1
 
 static const constexpr unsigned int kVerticalOffset = 30;
+static const constexpr unsigned int kPortNumOffset = 18190;
 
 enum Parameters {
     kParameterBasePortNumber,

diff --git a/src/plugin/WebView.hpp b/src/plugin/WebView.hpp
@@ -7,7 +7,7 @@ START_NAMESPACE_DISTRHO
 
 // -----------------------------------------------------------------------------------------------------------
 
-void* addWebView(uintptr_t viewptr);
+void* addWebView(uintptr_t parentWinId, uint port);
 void destroyWebView(void* webview);
 void reloadWebView(void* webview);
 void resizeWebView(void* webview, uint offset, uint width, uint height);

diff --git a/src/plugin/WebView.mm b/src/plugin/WebView.mm
@@ -12,44 +12,65 @@
 
 // -----------------------------------------------------------------------------------------------------------
 
-void* addWebView(const uintptr_t viewptr)
+struct WebViewImpl {
+    NSView* const view;
+    WKWebView* const webview;
+    NSURLRequest* const urlreq;
+};
+
+// -----------------------------------------------------------------------------------------------------------
+
+void* addWebView(const uintptr_t parentWinId, const uint port)
 {
-    NSView* const view = reinterpret_cast<NSView*>(viewptr);
+    NSView* const view = reinterpret_cast<NSView*>(parentWinId);
 
     const CGRect rect = CGRectMake(0,
                                    kVerticalOffset,
                                    DISTRHO_UI_DEFAULT_WIDTH,
                                    DISTRHO_UI_DEFAULT_HEIGHT - kVerticalOffset);
 
     WKWebView* const webview = [[WKWebView alloc] initWithFrame: rect];
-
     [[[webview configuration] preferences] setValue: @(true) forKey: @"developerExtrasEnabled"];
-
     [view addSubview:webview];
+
+    char url[32];
+    std::snprintf(url, 31, "http://127.0.0.1:%u/", port);
+    NSString* const nsurl = [[NSString alloc]
+        initWithBytes:url
+               length:std::strlen(url)
+             encoding:NSUTF8StringEncoding];
+    NSURLRequest* const urlreq = [[NSURLRequest alloc] initWithURL: [NSURL URLWithString: nsurl]];
+    [nsurl release];
+
+    [webview loadRequest: urlreq];
     [webview setHidden:NO];
 
-    return webview;
+    return new WebViewImpl{view, webview, urlreq};
 }
 
-void destroyWebView(void* const webviewptr)
+void destroyWebView(void* const webview)
 {
-    WKWebView* const webview = static_cast<WKWebView*>(webviewptr);
+    WebViewImpl* const impl = static_cast<WebViewImpl*>(webview);
+
+    [impl->webview setHidden:YES];
+    [impl->webview removeFromSuperview];
+    [impl->urlreq release];
 
-    [webview setHidden:YES];
+    delete impl;
 }
 
-void reloadWebView(void* const webviewptr)
+void reloadWebView(void* const webview)
 {
-    WKWebView* const webview = static_cast<WKWebView*>(webviewptr);
+    WebViewImpl* const impl = static_cast<WebViewImpl*>(webview);
 
-    [webview loadRequest: [NSURLRequest requestWithURL: [NSURL URLWithString:@"http://127.0.0.1:18181/"]]];
+    [impl->webview loadRequest: impl->urlreq];
 }
 
-void resizeWebView(void* const webviewptr, const uint offset, const uint width, const uint height)
+void resizeWebView(void* const webview, const uint offset, const uint width, const uint height)
 {
-    WKWebView* const webview = static_cast<WKWebView*>(webviewptr);
+    WebViewImpl* const impl = static_cast<WebViewImpl*>(webview);
 
-    [webview setFrame:CGRectMake(0, offset, width, height)];
+    [impl->webview setFrame:CGRectMake(0, offset, width, height)];
 }
 
 // -----------------------------------------------------------------------------------------------------------
+11 −10		LICENSE
+5 −3		distrho/DistrhoPluginUtils.hpp
+26 −25		utils/package-osx-bundles.sh
+16 −16		utils/plugin.pkg/package.xml.in