Fix up more macOS things, working better

Signed-off-by: falkTX <[email protected]>
mod-audio · Oct 13, 2023 · fcf46e7 · fcf46e7
1 parent 078699c
commit fcf46e7
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 31 deletions.
diff --git 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
diff --git a/mod-plugin-builder b/mod-plugin-builder
diff --git a/systray/mod-app.hpp b/systray/mod-app.hpp
@@ -632,32 +632,34 @@ 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");
             arguments.append(devInfo.uidMain);
             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
@@ -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