More plugins, start readme

Signed-off-by: falkTX <falktx@falktx.com>

Makefile

@@ -125,9 +125,10 @@ BUNDLES += FluidSynthLeads.lv2
 BUNDLES += FluidSynthPads.lv2
 BUNDLES += Red_Zeppelin_4.lv2
 BUNDLES += Red_Zeppelin_5.lv2
-# ifneq ($(MACOS),true)
+ifneq ($(MACOS),true)
+# FIXME needs python2
 # BUNDLES += fomp.lv2
-# endif
+endif
 BUNDLES += Kars.lv2
 ifneq ($(MACOS),true)
 # FIXME *.so extension
@@ -153,7 +154,6 @@ BUNDLES += mod-mda-DX10.lv2
 BUNDLES += mod-mda-EPiano.lv2
 BUNDLES += mod-mda-JX10.lv2
 BUNDLES += mod-mda-Leslie.lv2
-BUNDLES += mod-mda-Overdrive.lv2
 BUNDLES += mod-mda-Piano.lv2
 BUNDLES += mod-mda-RePsycho.lv2
 BUNDLES += mod-mda-RingMod.lv2
@@ -179,8 +179,23 @@ ifneq ($(MACOS),true)
 # FIXME plugin binary missing (win32 RUNTIME vs LIBRARY)
 BUNDLES += rt-neural-generic.lv2
 endif
+# FIXME *.so extension
+BUNDLES += tinygain.lv2
 BUNDLES += wolf-shaper.lv2
 
+# TODO check
+BUNDLES += Harmless.lv2
+BUNDLES += Larynx.lv2
+BUNDLES += Modulay.lv2
+BUNDLES += Shiroverb.lv2
+
+
+# TODO build fails
+# BUNDLES += mod-ams.lv2
+# BUNDLES += mod-cv-control.lv2
+# BUNDLES += sooperlooper.lv2
+# BUNDLES += sooperlooper-2x2.lv2
+
 PLUGINS = $(BUNDLES:%=build/plugins/%)
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -343,7 +358,7 @@ systray/mod-app$(APP_EXT): systray/main.cpp systray/mod-app.hpp
 
 build/plugins/%: $(PAWPAW_PREFIX)/lib/lv2/%/manifest.ttl
 	@mkdir -p build/plugins
-	ln -sf $(abspath $<) $@
+	ln -sf $(subst /manifest.ttl,,$(abspath $<)) $@
 
 $(PAWPAW_PREFIX)/lib/lv2/abGate.lv2/manifest.ttl: $(BOOTSTRAP_FILES)
 	./utils/plugin-builder.sh $(PAWPAW_TARGET) abgate
@@ -426,9 +441,36 @@ $(PAWPAW_PREFIX)/lib/lv2/midifilter.lv2/manifest.ttl: $(BOOTSTRAP_FILES)
 $(PAWPAW_PREFIX)/lib/lv2/midigen.lv2/manifest.ttl: $(BOOTSTRAP_FILES)
 	./utils/plugin-builder.sh $(PAWPAW_TARGET) x42-midigen
 
+$(PAWPAW_PREFIX)/lib/lv2/Harmless.lv2/manifest.ttl: $(BOOTSTRAP_FILES)
+	./utils/plugin-builder.sh $(PAWPAW_TARGET) shiro-plugins
+
+$(PAWPAW_PREFIX)/lib/lv2/Larynx.lv2/manifest.ttl: $(BOOTSTRAP_FILES)
+	./utils/plugin-builder.sh $(PAWPAW_TARGET) shiro-plugins
+
+$(PAWPAW_PREFIX)/lib/lv2/Modulay.lv2/manifest.ttl: $(BOOTSTRAP_FILES)
+	./utils/plugin-builder.sh $(PAWPAW_TARGET) shiro-plugins
+
+$(PAWPAW_PREFIX)/lib/lv2/Shiroverb.lv2/manifest.ttl: $(BOOTSTRAP_FILES)
+	./utils/plugin-builder.sh $(PAWPAW_TARGET) shiro-plugins
+
+$(PAWPAW_PREFIX)/lib/lv2/sooperlooper.lv2/manifest.ttl: $(BOOTSTRAP_FILES)
+	./utils/plugin-builder.sh $(PAWPAW_TARGET) sooperlooper-lv2
+
+$(PAWPAW_PREFIX)/lib/lv2/sooperlooper-2x2.lv2/manifest.ttl: $(BOOTSTRAP_FILES)
+	./utils/plugin-builder.sh $(PAWPAW_TARGET) sooperlooper-lv2
+
+$(PAWPAW_PREFIX)/lib/lv2/tinygain.lv2/manifest.ttl: $(BOOTSTRAP_FILES)
+	./utils/plugin-builder.sh $(PAWPAW_TARGET) x42-tinygain
+
 $(PAWPAW_PREFIX)/lib/lv2/wolf-shaper.lv2/manifest.ttl: $(BOOTSTRAP_FILES)
 	./utils/plugin-builder.sh $(PAWPAW_TARGET) wolf-shaper
 
+$(PAWPAW_PREFIX)/lib/lv2/mod-ams.lv2/manifest.ttl: $(BOOTSTRAP_FILES)
+	./utils/plugin-builder.sh $(PAWPAW_TARGET) mod-ams-lv2
+
+$(PAWPAW_PREFIX)/lib/lv2/mod-cv-control.lv2/manifest.ttl: $(BOOTSTRAP_FILES)
+	./utils/plugin-builder.sh $(PAWPAW_TARGET) mod-cv-plugins
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(PAWPAW_PREFIX)/bin/%:

README.md

@@ -0,0 +1,6 @@
+# MOD App
+
+**MOD Audio is on the desktop!**
+
+This is the source code repository for MOD App, a little tool by [MOD Audio](https://mod.audio/) that combines all the goodies from MOD for the desktop platform packaged in a convenient installer.
+

systray/main.cpp

@@ -90,7 +90,7 @@ int main(int argc, char* argv[])
 
     if (SHGetSpecialFolderPathW(nullptr, path, CSIDL_MYDOCUMENTS, FALSE))
     {
-        std::wcscat(path, L"\\mod-app");
+        std::wcscat(path, L"\\MOD App");
         _wmkdir(path);
         SetEnvironmentVariableW(L"MOD_DATA_DIR", path);
 

systray/mod-app.hpp

@@ -446,6 +446,7 @@ private slots:
         writeMidiChannelsToProfile(ui.sp_midi_pb->value(), ui.sp_midi_ss->value());
 
         const bool midiEnabled = ui.gb_midi->isChecked();
+        const QString devName(ui.cb_device->currentText());
 
         QStringList arguments = {
             "-R",
@@ -485,20 +486,29 @@ private slots:
         arguments.append("-p");
         arguments.append(ui.cb_buffersize->currentIndex() == 0 ? "128" : "256");
 
-        arguments.append("-d");
-        arguments.append(ui.cb_device->currentText());
-
        #ifdef Q_OS_WIN
         const QString& inputDev(matchingWasapiInputDevices[ui.cb_device->currentIndex()]);
 
+        // WASAPI forced duplex
         if (! inputDev.isEmpty())
         {
             arguments.append("-P");
-            arguments.append(ui.cb_device->currentText());
+            arguments.append(devName);
             arguments.append("-C");
             arguments.append(inputDev);
         }
+        // WASAPI playback only mode
+        else if (devName.startsWith("Windows WASAPI::"))
+        {
+            arguments.append("-P");
+            arguments.append(devName);
+        }
+        else
        #endif
+        {
+            arguments.append("-d");
+            arguments.append(devName);
+        }
 
        #if !(defined(Q_OS_WIN) || defined(Q_OS_MAC))
         if (! midiEnabled)

utils/plugin-builder.mk

@@ -60,7 +60,7 @@ PARALLEL_JOBS = $(shell nproc)
 endif
 
 ifeq ($(WINDOWS),true)
-HOST_DIR = $(PAWPAW_PREFIX)-host
+HOST_DIR = ~/mod-workdir/moddwarf-new/host/
 else
 HOST_DIR = $(PAWPAW_PREFIX)
 endif

utils/win64-installer.iss

@@ -8,7 +8,7 @@ AppPublisherURL=https://mod.audio/
 AppSupportURL=https://github.com/moddevices/mod-app/issues/
 AppUpdatesURL=https://github.com/moddevices/mod-app/releases/
 AppVersion={#VERSION}
-DefaultDirName={commonpf64}\mod-app
+DefaultDirName={commonpf64}\MOD App
 DisableDirPage=yes
 DisableWelcomePage=no
 LicenseFile=..\LICENSE