Browse Source

Merge remote-tracking branch 'upstream/v1' into v1

pull/1454/head
Fabrizio DUHEM 5 years ago
parent
commit
61b8feb54a
2 changed files with 11 additions and 3 deletions
  1. +7
    -3
      dep/Makefile
  2. +4
    -0
      src/app/RackWidget.cpp

+ 7
- 3
dep/Makefile View File

@@ -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-jack=no
else
RTMIDI_FLAGS += --with-jack=yes
RTMIDI_FLAGS += --with-winmm
endif
ifdef ARCH_LIN
RTMIDI_FLAGS += --with-jack --with-alsa
endif

$(rtmidi): rtmidi-4.0.0


+ 4
- 0
src/app/RackWidget.cpp View File

@@ -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


Loading…
Cancel
Save