More dynamic handling and macOS fixes

Signed-off-by: falkTX <[email protected]>
mod-audio · Mar 17, 2024 · 345a3ef · 345a3ef
1 parent fbfbe99
commit 345a3ef
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/src/PawPaw b/src/PawPaw
diff --git a/src/plugin/DesktopPlugin.cpp b/src/plugin/DesktopPlugin.cpp
@@ -72,9 +72,15 @@ class DesktopPlugin : public Plugin,
             return;
         }
 
-        portBaseNum = availablePortNum;
-
         bufferSizeChanged(getBufferSize());
+
+        if (shm.data == nullptr && ! shm.init(availablePortNum))
+        {
+            parameters[kParameterBasePortNumber] = portBaseNum = -kErrorShmSetupFailed;
+            return;
+        }
+
+        portBaseNum = availablePortNum;
     }
 
     ~DesktopPlugin()
@@ -351,7 +357,7 @@ class DesktopPlugin : public Plugin,
         {
             firstTimeActivating = false;
 
-            if (run())
+            if (portBaseNum > 0 && run())
                 startRunner(500);
         }
         else

diff --git a/src/plugin/SharedMemory.hpp b/src/plugin/SharedMemory.hpp
@@ -127,13 +127,12 @@ class SharedMemory
         CloseHandle(shm);
        #else
         std::snprintf(shmName, 31, "/mod-desktop-shm-%d", portBaseNum);
-        const int fd = shm_open(shmName, O_RDWR, 0);
+        const int fd = shm_open(shmName, O_RDONLY, 0);
 
         if (fd < 0)
             return true;
 
         close(fd);
-        shm_unlink(shmName);
        #endif
 
         return false;

diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
@@ -111,6 +111,7 @@ static const wchar_t* getAppDirW()
 const char* getAppDir()
 {
    #ifdef DISTRHO_OS_MAC
+    // return "/Users/falktx/Source/MOD/mod-app/build/mod-desktop.app/Contents/MacOS";
     return "/Applications/MOD Desktop.app/Contents/MacOS";
    #else
     static char appDir[PATH_MAX] = {};