From 4c6255eab63bfebb59ebb61783c470d02805a56c Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Fri, 5 Jul 2019 09:15:22 -0700 Subject: [PATCH 1/3] Disable RtMidi JACK on Mac. --- dep/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dep/Makefile b/dep/Makefile index e97cc4a0..23b801db 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -163,10 +163,10 @@ rtmidi-4.0.0: rm rtmidi-4.0.0.tar.gz RTMIDI_FLAGS += --enable-shared=no -ifdef ARCH_WIN -RTMIDI_FLAGS += --with-jack=no -else +ifdef ARCH_LIN RTMIDI_FLAGS += --with-jack=yes +else +RTMIDI_FLAGS += --with-jack=no endif $(rtmidi): rtmidi-4.0.0 From 2f8af62b6e24c35691de4d745f8b1eaae26f8b8a Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Fri, 5 Jul 2019 10:09:21 -0700 Subject: [PATCH 2/3] Re-enable ALSA MIDI on Linux --- dep/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dep/Makefile b/dep/Makefile index 23b801db..fe35541c 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -163,10 +163,14 @@ rtmidi-4.0.0: rm rtmidi-4.0.0.tar.gz RTMIDI_FLAGS += --enable-shared=no +ifdef ARCH_MAC +RTMIDI_FLAGS += --with-core --without-jack +endif +ifdef ARCH_WIN +RTMIDI_FLAGS += --with-winmm +endif ifdef ARCH_LIN -RTMIDI_FLAGS += --with-jack=yes -else -RTMIDI_FLAGS += --with-jack=no +RTMIDI_FLAGS += --with-jack --with-alsa endif $(rtmidi): rtmidi-4.0.0 From f3bd8baa4adaba3d4d5aad0893f78cc7ac6b2b76 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Sat, 6 Jul 2019 09:59:42 -0700 Subject: [PATCH 3/3] Fix crash in RackWidget::pastePresetClipboardAction(). --- src/app/RackWidget.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/RackWidget.cpp b/src/app/RackWidget.cpp index 3f01529d..035d8fd2 100644 --- a/src/app/RackWidget.cpp +++ b/src/app/RackWidget.cpp @@ -293,6 +293,10 @@ void RackWidget::pastePresetClipboardAction() { if (moduleJ) { ModuleWidget *mw = moduleFromJson(moduleJ); json_decref(moduleJ); + + // Reset ID so the Engine automatically assigns a new one + mw->module->id = -1; + addModuleAtMouse(mw); // history::ModuleAdd