From fcf46e74652edbae7798148990d8eef1a45a6f12 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Fri, 13 Oct 2023 11:55:51 +0200
Subject: [PATCH] Fix up more macOS things, working better

Signed-off-by: falkTX <falktx@falktx.com>
---
 Makefile            | 12 +-----------
 mod-host            |  2 +-
 mod-plugin-builder  |  2 +-
 systray/mod-app.hpp | 36 +++++++++++++++++++-----------------
 utils/macos-dmg.sh  |  7 ++++++-
 5 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/Makefile b/Makefile
index a1a4681..d268f37 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-VERSION = 0.0.1
+VERSION = 0.0.2
 
 CC ?= gcc
 TARGET_MACHINE := $(shell $(CC) -dumpmachine)
@@ -124,10 +124,7 @@ endif
 
 BUNDLES  = abGate.lv2
 BUNDLES += artyfx.lv2
-ifneq ($(MACOS),true)
-# FIXME crashes on load
 BUNDLES += carla-files.lv2
-endif
 BUNDLES += DragonflyEarlyReflections.lv2
 BUNDLES += DragonflyHallReverb.lv2
 BUNDLES += DragonflyPlateReverb.lv2
@@ -155,10 +152,8 @@ BUNDLES += FluidSynthLeads.lv2
 BUNDLES += FluidSynthPads.lv2
 BUNDLES += Red_Zeppelin_4.lv2
 BUNDLES += Red_Zeppelin_5.lv2
-ifneq ($(MACOS),true)
 # FIXME needs python2
 # BUNDLES += fomp.lv2
-endif
 BUNDLES += Kars.lv2
 BUNDLES += midifilter.lv2
 BUNDLES += midigen.lv2
@@ -184,24 +179,19 @@ BUNDLES += mod-mda-SubSynth.lv2
 BUNDLES += mod-mda-ThruZero.lv2
 BUNDLES += mod-mda-Vocoder.lv2
 BUNDLES += modmeter.lv2
-ifneq ($(MACOS),true)
 # FIXME fails to build: implicit declaration of function '__atomic_store_4'
 BUNDLES += modspectre.lv2
-endif
 BUNDLES += MVerb.lv2
 BUNDLES += Nekobi.lv2
 BUNDLES += neural_amp_modeler.lv2
-ifneq ($(MACOS),true)
 # FIXME fails to build: implicit declaration of function 'basename'
 BUNDLES += notes.lv2
-endif
 BUNDLES += PingPongPan.lv2
 # FIXME plugin binary missing (win32 RUNTIME vs LIBRARY)
 BUNDLES += rt-neural-generic.lv2
 BUNDLES += tinygain.lv2
 BUNDLES += wolf-shaper.lv2
 
-# TODO check
 BUNDLES += Harmless.lv2
 BUNDLES += Larynx.lv2
 BUNDLES += Modulay.lv2
diff --git a/mod-host b/mod-host
index ee44192..1714266 160000
--- a/mod-host
+++ b/mod-host
@@ -1 +1 @@
-Subproject commit ee441925be281fc6f2be12e2fa7c05d706903f84
+Subproject commit 1714266eebc018b4964b475f40213bb327b25e1e
diff --git a/mod-plugin-builder b/mod-plugin-builder
index f0ea333..e9eaebe 160000
--- a/mod-plugin-builder
+++ b/mod-plugin-builder
@@ -1 +1 @@
-Subproject commit f0ea3334ba0b7042c8f7dab4f83154254b887336
+Subproject commit e9eaebe6784c56e068b3d80a36471b3b1a369e70
diff --git a/systray/mod-app.hpp b/systray/mod-app.hpp
index 4d28539..79491d6 100644
--- a/systray/mod-app.hpp
+++ b/systray/mod-app.hpp
@@ -632,7 +632,7 @@ private slots:
         arguments.append(ui.cb_buffersize->currentIndex() == 0 ? "128" : "256");
 
 
-        // forced duplex
+        // duplex with separate input device
         if (! devInfo.uidInput.isEmpty())
         {
             arguments.append("-P");
@@ -640,24 +640,26 @@ private slots:
             arguments.append("-C");
             arguments.append(devInfo.uidInput);
         }
+        // regular duplex
+        else if (devInfo.canInput && devInfo.canOutput)
+        {
+            arguments.append("-d");
+            arguments.append(devInfo.uidMain);
+            arguments.append("-P");
+            arguments.append(devInfo.uidMain);
+            arguments.append("-C");
+            arguments.append(devInfo.uidMain);
+        }
+        // capture only
+        else if (devInfo.canInput)
+        {
+            arguments.append("-C");
+            arguments.append(devInfo.uidMain);
+        }
+        // playback only
         else
         {
-            if (devInfo.canInput && devInfo.canOutput)
-            {
-                // regular device duplex mode
-                arguments.append("-d");
-            }
-            else if (devInfo.canInput)
-            {
-                // capture only
-                arguments.append("-C");
-            }
-            else
-            {
-                // playback only
-                arguments.append("-P");
-            }
-
+            arguments.append("-P");
             arguments.append(devInfo.uidMain);
         }
 
diff --git a/utils/macos-dmg.sh b/utils/macos-dmg.sh
index f2446f5..39e31cb 100755
--- a/utils/macos-dmg.sh
+++ b/utils/macos-dmg.sh
@@ -32,11 +32,16 @@ for f in $(ls Frameworks/*/Qt* PlugIns/*/libq*.dylib); do
     done
 done
 
-for f in $(ls MacOS/jackd MacOS/lib/libmod_utils.so MacOS/libjack*.dylib MacOS/jack/*.so); do
+for f in $(ls MacOS/lib/libmod_utils.so MacOS/libjack*.dylib); do
     install_name_tool -change "${HOME}/PawPawBuilds/targets/macos-universal-10.15/lib/libjack.0.1.0.dylib" "@executable_path/libjack.0.dylib" "${f}"
     install_name_tool -change "${HOME}/PawPawBuilds/targets/macos-universal-10.15/lib/libjackserver.0.1.0.dylib" "@executable_path/libjackserver.0.dylib" "${f}"
 done
 
+for f in $(ls MacOS/jackd MacOS/jack/*.so); do
+    install_name_tool -change "${HOME}/PawPawBuilds/targets/macos-universal-10.15/lib/libjack.0.1.0.dylib" "@executable_path/libjackserver.0.dylib" "${f}"
+    install_name_tool -change "${HOME}/PawPawBuilds/targets/macos-universal-10.15/lib/libjackserver.0.1.0.dylib" "@executable_path/libjackserver.0.dylib" "${f}"
+done
+
 popd
 
 hdiutil create "mod-app-$(make version)-macOS.dmg" -srcfolder build/dmg -volname "MOD App" -fs HFS+ -ov