From 825f8cf54f4ca1ecdcc575992f9360ee58312d91 Mon Sep 17 00:00:00 2001
From: Albert Graef <aggraef@gmail.com>
Date: Thu, 11 Oct 2018 19:50:01 +0200
Subject: [PATCH] Add different variants of the midizap patchbay for use with
 or without a2jmidid. The former requires that a2jmidid is running, the latter
 will work without, but only when Jack1 is used with seq as MIDI driver, as
 described in the manual.

---
 examples/midizap-a2j.xml | 150 +++++++++++++++++++++++++++++++++++++++
 examples/midizap.xml     |  48 ++++++-------
 2 files changed, 174 insertions(+), 24 deletions(-)
 create mode 100644 examples/midizap-a2j.xml

diff --git a/examples/midizap-a2j.xml b/examples/midizap-a2j.xml
new file mode 100644
index 0000000..40ab87d
--- /dev/null
+++ b/examples/midizap-a2j.xml
@@ -0,0 +1,150 @@
+<!DOCTYPE patchbay>
+<patchbay name="midizap" version="0.5.4">
+ <output-sockets>
+  <socket type="jack-midi" name="Ctlra Maschine" exclusive="off" client="a2j">
+   <plug>Ctlra Maschine Mk3.*</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-Maschine" exclusive="off" client="midizap-Maschine">
+   <plug>midi_out</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-Maschine 2" exclusive="off" client="midizap-Maschine">
+   <plug>midi_out2</plug>
+  </socket>
+  <socket type="jack-midi" name="Ardour mackie out" exclusive="off" client="ardour">
+   <plug>mackie control out</plug>
+  </socket>
+  <socket type="jack-midi" name="nanoKONTROL2" exclusive="off" client="a2j">
+   <plug>nanoKONTROL2.* MIDI 1</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-nanoKONTROL 1" exclusive="off" client="midizap-nanoKONTROL2">
+   <plug>midi_out</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-nanoKONTROL 2" exclusive="off" client="midizap-nanoKONTROL2">
+   <plug>midi_out2</plug>
+  </socket>
+  <socket type="jack-midi" name="X-Touch" exclusive="off" client="a2j">
+   <plug>.*X-Touch MIDI 1</plug>
+  </socket>
+  <socket type="jack-midi" name="X-Touch MINI" exclusive="off" client="a2j">
+   <plug>.*X-TOUCH MINI MIDI 1</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-XTouchMini 1" exclusive="off" client="midizap-XTouchMini">
+   <plug>midi_out</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-XTouchMini 2" exclusive="off" client="midizap-XTouchMini">
+   <plug>midi_out2</plug>
+  </socket>
+  <socket type="jack-midi" name="X-Touch One" exclusive="off" client="a2j">
+   <plug>X-Touch One.* MIDI 1</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-XTouchONE 1" exclusive="off" client="midizap-XTouchONE">
+   <plug>midi_out</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-XTouchONE 2" exclusive="off" client="midizap-XTouchONE">
+   <plug>midi_out2</plug>
+  </socket>
+  <socket type="jack-midi" name="APCmini" exclusive="off" client="a2j">
+   <plug>APC MINI.* MIDI 1</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-APCmini 1" exclusive="off" client="midizap-APCmini">
+   <plug>midi_out</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-APCmini 2" exclusive="off" client="midizap-APCmini">
+   <plug>midi_out2</plug>
+  </socket>
+  <socket type="jack-midi" name="MPKmini2" exclusive="off" client="a2j">
+   <plug>MPKmini2.* MIDI 1</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-MPKmini 1" exclusive="off" client="midizap-MPKmini2">
+   <plug>midi_out</plug>
+  </socket>
+  <socket type="jack-midi" name="shuttlepro" exclusive="off" client="shuttlepro">
+   <plug>midi_out</plug>
+  </socket>
+ </output-sockets>
+ <input-sockets>
+  <socket type="jack-midi" name="midizap-Maschine" exclusive="off" client="midizap-Maschine">
+   <plug>midi_in</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-Maschine 2" exclusive="off" client="midizap-Maschine">
+   <plug>midi_in2</plug>
+  </socket>
+  <socket type="jack-midi" name="Ctlra Maschine" exclusive="off" client="a2j">
+   <plug>Ctlra Maschine Mk3.*</plug>
+  </socket>
+  <socket type="jack-midi" name="Ardour mackie in" exclusive="off" client="ardour">
+   <plug>mackie control in</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-nanoKONTROL 1" exclusive="off" client="midizap-nanoKONTROL2">
+   <plug>midi_in</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-nanoKONTROL 2" exclusive="off" client="midizap-nanoKONTROL2">
+   <plug>midi_in2</plug>
+  </socket>
+  <socket type="jack-midi" name="nanoKONTROL2" exclusive="off" client="a2j">
+   <plug>nanoKONTROL2.* MIDI 1</plug>
+  </socket>
+  <socket type="jack-midi" name="X-Touch" exclusive="off" client="a2j">
+   <plug>.*X-Touch MIDI 1</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-XTouchMini 1" exclusive="off" client="midizap-XTouchMini">
+   <plug>midi_in</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-XTouchMini 2" exclusive="off" client="midizap-XTouchMini">
+   <plug>midi_in2</plug>
+  </socket>
+  <socket type="jack-midi" name="X-Touch MINI" exclusive="off" client="a2j">
+   <plug>.*X-TOUCH MINI MIDI 1</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-XTouchONE 1" exclusive="off" client="midizap-XTouchONE">
+   <plug>midi_in</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-XTouchONE 2" exclusive="off" client="midizap-XTouchONE">
+   <plug>midi_in2</plug>
+  </socket>
+  <socket type="jack-midi" name="X-Touch One" exclusive="off" client="a2j">
+   <plug>X-Touch One.* MIDI 1</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-APCmini 1" exclusive="off" client="midizap-APCmini">
+   <plug>midi_in</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-APCmini 2" exclusive="off" client="midizap-APCmini">
+   <plug>midi_in2</plug>
+  </socket>
+  <socket type="jack-midi" name="APCmini" exclusive="off" client="a2j">
+   <plug>APC MINI.* MIDI 1</plug>
+  </socket>
+  <socket type="jack-midi" name="midizap-MPKmini 1" exclusive="off" client="midizap-MPKmini2">
+   <plug>midi_in</plug>
+  </socket>
+ </input-sockets>
+ <slots/>
+ <cables>
+  <cable type="jack-midi" output="Ctlra Maschine" input="midizap-Maschine"/>
+  <cable type="jack-midi" output="midizap-Maschine" input="Ardour mackie in"/>
+  <cable type="jack-midi" output="midizap-Maschine 2" input="Ctlra Maschine"/>
+  <cable type="jack-midi" output="Ardour mackie out" input="midizap-Maschine 2"/>
+  <cable type="jack-midi" output="Ardour mackie out" input="X-Touch"/>
+  <cable type="jack-midi" output="Ardour mackie out" input="midizap-APCmini 2"/>
+  <cable type="jack-midi" output="Ardour mackie out" input="midizap-XTouchONE 2"/>
+  <cable type="jack-midi" output="Ardour mackie out" input="midizap-nanoKONTROL 2"/>
+  <cable type="jack-midi" output="Ardour mackie out" input="midizap-XTouchMini 2"/>
+  <cable type="jack-midi" output="nanoKONTROL2" input="midizap-nanoKONTROL 1"/>
+  <cable type="jack-midi" output="midizap-nanoKONTROL 1" input="Ardour mackie in"/>
+  <cable type="jack-midi" output="midizap-nanoKONTROL 2" input="nanoKONTROL2"/>
+  <cable type="jack-midi" output="X-Touch" input="Ardour mackie in"/>
+  <cable type="jack-midi" output="X-Touch One" input="midizap-XTouchONE 1"/>
+  <cable type="jack-midi" output="midizap-XTouchONE 1" input="Ardour mackie in"/>
+  <cable type="jack-midi" output="midizap-XTouchONE 2" input="X-Touch One"/>
+  <cable type="jack-midi" output="APCmini" input="midizap-APCmini 1"/>
+  <cable type="jack-midi" output="midizap-APCmini 1" input="Ardour mackie in"/>
+  <cable type="jack-midi" output="midizap-APCmini 2" input="APCmini"/>
+  <cable type="jack-midi" output="MPKmini2" input="midizap-MPKmini 1"/>
+  <cable type="jack-midi" output="midizap-MPKmini 1" input="Ardour mackie in"/>
+  <cable type="jack-midi" output="shuttlepro" input="Ardour mackie in"/>
+  <cable type="jack-midi" output="X-Touch MINI" input="midizap-XTouchMini 1"/>
+  <cable type="jack-midi" output="midizap-XTouchMini 1" input="Ardour mackie in"/>
+  <cable type="jack-midi" output="midizap-XTouchMini 2" input="X-Touch MINI"/>
+ </cables>
+</patchbay>
+
diff --git a/examples/midizap.xml b/examples/midizap.xml
index 40ab87d..c14110b 100644
--- a/examples/midizap.xml
+++ b/examples/midizap.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE patchbay>
 <patchbay name="midizap" version="0.5.4">
  <output-sockets>
-  <socket type="jack-midi" name="Ctlra Maschine" exclusive="off" client="a2j">
+  <socket type="jack-midi" name="Ctlra Maschine" exclusive="off" client="alsa_midi">
    <plug>Ctlra Maschine Mk3.*</plug>
   </socket>
   <socket type="jack-midi" name="midizap-Maschine" exclusive="off" client="midizap-Maschine">
@@ -13,8 +13,8 @@
   <socket type="jack-midi" name="Ardour mackie out" exclusive="off" client="ardour">
    <plug>mackie control out</plug>
   </socket>
-  <socket type="jack-midi" name="nanoKONTROL2" exclusive="off" client="a2j">
-   <plug>nanoKONTROL2.* MIDI 1</plug>
+  <socket type="jack-midi" name="nanoKONTROL2" exclusive="off" client="alsa_midi">
+   <plug>nanoKONTROL2.* MIDI 1.*</plug>
   </socket>
   <socket type="jack-midi" name="midizap-nanoKONTROL 1" exclusive="off" client="midizap-nanoKONTROL2">
    <plug>midi_out</plug>
@@ -22,11 +22,11 @@
   <socket type="jack-midi" name="midizap-nanoKONTROL 2" exclusive="off" client="midizap-nanoKONTROL2">
    <plug>midi_out2</plug>
   </socket>
-  <socket type="jack-midi" name="X-Touch" exclusive="off" client="a2j">
-   <plug>.*X-Touch MIDI 1</plug>
+  <socket type="jack-midi" name="X-Touch" exclusive="off" client="alsa_midi">
+   <plug>.*X-Touch MIDI 1.*</plug>
   </socket>
-  <socket type="jack-midi" name="X-Touch MINI" exclusive="off" client="a2j">
-   <plug>.*X-TOUCH MINI MIDI 1</plug>
+  <socket type="jack-midi" name="X-Touch MINI" exclusive="off" client="alsa_midi">
+   <plug>.*X-TOUCH MINI MIDI 1.*</plug>
   </socket>
   <socket type="jack-midi" name="midizap-XTouchMini 1" exclusive="off" client="midizap-XTouchMini">
    <plug>midi_out</plug>
@@ -34,8 +34,8 @@
   <socket type="jack-midi" name="midizap-XTouchMini 2" exclusive="off" client="midizap-XTouchMini">
    <plug>midi_out2</plug>
   </socket>
-  <socket type="jack-midi" name="X-Touch One" exclusive="off" client="a2j">
-   <plug>X-Touch One.* MIDI 1</plug>
+  <socket type="jack-midi" name="X-Touch One" exclusive="off" client="alsa_midi">
+   <plug>X-Touch One.* MIDI 1.*</plug>
   </socket>
   <socket type="jack-midi" name="midizap-XTouchONE 1" exclusive="off" client="midizap-XTouchONE">
    <plug>midi_out</plug>
@@ -43,8 +43,8 @@
   <socket type="jack-midi" name="midizap-XTouchONE 2" exclusive="off" client="midizap-XTouchONE">
    <plug>midi_out2</plug>
   </socket>
-  <socket type="jack-midi" name="APCmini" exclusive="off" client="a2j">
-   <plug>APC MINI.* MIDI 1</plug>
+  <socket type="jack-midi" name="APCmini" exclusive="off" client="alsa_midi">
+   <plug>APC MINI.* MIDI 1.*</plug>
   </socket>
   <socket type="jack-midi" name="midizap-APCmini 1" exclusive="off" client="midizap-APCmini">
    <plug>midi_out</plug>
@@ -52,8 +52,8 @@
   <socket type="jack-midi" name="midizap-APCmini 2" exclusive="off" client="midizap-APCmini">
    <plug>midi_out2</plug>
   </socket>
-  <socket type="jack-midi" name="MPKmini2" exclusive="off" client="a2j">
-   <plug>MPKmini2.* MIDI 1</plug>
+  <socket type="jack-midi" name="MPKmini2" exclusive="off" client="alsa_midi">
+   <plug>MPKmini2.* MIDI 1.*</plug>
   </socket>
   <socket type="jack-midi" name="midizap-MPKmini 1" exclusive="off" client="midizap-MPKmini2">
    <plug>midi_out</plug>
@@ -69,7 +69,7 @@
   <socket type="jack-midi" name="midizap-Maschine 2" exclusive="off" client="midizap-Maschine">
    <plug>midi_in2</plug>
   </socket>
-  <socket type="jack-midi" name="Ctlra Maschine" exclusive="off" client="a2j">
+  <socket type="jack-midi" name="Ctlra Maschine" exclusive="off" client="alsa_midi">
    <plug>Ctlra Maschine Mk3.*</plug>
   </socket>
   <socket type="jack-midi" name="Ardour mackie in" exclusive="off" client="ardour">
@@ -81,11 +81,11 @@
   <socket type="jack-midi" name="midizap-nanoKONTROL 2" exclusive="off" client="midizap-nanoKONTROL2">
    <plug>midi_in2</plug>
   </socket>
-  <socket type="jack-midi" name="nanoKONTROL2" exclusive="off" client="a2j">
-   <plug>nanoKONTROL2.* MIDI 1</plug>
+  <socket type="jack-midi" name="nanoKONTROL2" exclusive="off" client="alsa_midi">
+   <plug>nanoKONTROL2.* MIDI 1.*</plug>
   </socket>
-  <socket type="jack-midi" name="X-Touch" exclusive="off" client="a2j">
-   <plug>.*X-Touch MIDI 1</plug>
+  <socket type="jack-midi" name="X-Touch" exclusive="off" client="alsa_midi">
+   <plug>.*X-Touch MIDI 1.*</plug>
   </socket>
   <socket type="jack-midi" name="midizap-XTouchMini 1" exclusive="off" client="midizap-XTouchMini">
    <plug>midi_in</plug>
@@ -93,8 +93,8 @@
   <socket type="jack-midi" name="midizap-XTouchMini 2" exclusive="off" client="midizap-XTouchMini">
    <plug>midi_in2</plug>
   </socket>
-  <socket type="jack-midi" name="X-Touch MINI" exclusive="off" client="a2j">
-   <plug>.*X-TOUCH MINI MIDI 1</plug>
+  <socket type="jack-midi" name="X-Touch MINI" exclusive="off" client="alsa_midi">
+   <plug>.*X-TOUCH MINI MIDI 1.*</plug>
   </socket>
   <socket type="jack-midi" name="midizap-XTouchONE 1" exclusive="off" client="midizap-XTouchONE">
    <plug>midi_in</plug>
@@ -102,8 +102,8 @@
   <socket type="jack-midi" name="midizap-XTouchONE 2" exclusive="off" client="midizap-XTouchONE">
    <plug>midi_in2</plug>
   </socket>
-  <socket type="jack-midi" name="X-Touch One" exclusive="off" client="a2j">
-   <plug>X-Touch One.* MIDI 1</plug>
+  <socket type="jack-midi" name="X-Touch One" exclusive="off" client="alsa_midi">
+   <plug>X-Touch One.* MIDI 1.*</plug>
   </socket>
   <socket type="jack-midi" name="midizap-APCmini 1" exclusive="off" client="midizap-APCmini">
    <plug>midi_in</plug>
@@ -111,8 +111,8 @@
   <socket type="jack-midi" name="midizap-APCmini 2" exclusive="off" client="midizap-APCmini">
    <plug>midi_in2</plug>
   </socket>
-  <socket type="jack-midi" name="APCmini" exclusive="off" client="a2j">
-   <plug>APC MINI.* MIDI 1</plug>
+  <socket type="jack-midi" name="APCmini" exclusive="off" client="alsa_midi">
+   <plug>APC MINI.* MIDI 1.*</plug>
   </socket>
   <socket type="jack-midi" name="midizap-MPKmini 1" exclusive="off" client="midizap-MPKmini2">
    <plug>midi_in</plug>