From fef71c3e39f25a920f585c451b26d0c9f4a41add Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jdbernard@gmail.com>
Date: Sat, 22 Jul 2017 15:32:37 -0500
Subject: [PATCH] Update QJackCtl routings.

---
 .../church-eq-bass-with-synth.xml             | 17 +++-
 qjackctl-routing-settings/onboard.xml         | 82 ++++++++++++-------
 2 files changed, 68 insertions(+), 31 deletions(-)

diff --git a/qjackctl-routing-settings/church-eq-bass-with-synth.xml b/qjackctl-routing-settings/church-eq-bass-with-synth.xml
index 520375a..fd49b7a 100644
--- a/qjackctl-routing-settings/church-eq-bass-with-synth.xml
+++ b/qjackctl-routing-settings/church-eq-bass-with-synth.xml
@@ -31,6 +31,12 @@
   <socket exclusive="off" client="yoshimi" type="jack-audio" name="yoshimi OUT R">
    <plug>right</plug>
   </socket>
+  <socket exclusive="off" client="MDA ePiano" type="jack-audio" name="MDA ePiano OUT L">
+   <plug>left_out</plug>
+  </socket>
+  <socket exclusive="off" client="MDA ePiano" type="jack-audio" name="MDA ePiano OUT R">
+   <plug>right_out</plug>
+  </socket>
   <socket exclusive="off" client="LPK25" type="alsa-midi" name="Akai LPK25">
    <plug>LPK25 MIDI 1</plug>
   </socket>
@@ -90,6 +96,9 @@
   <socket exclusive="off" client="yoshimi-01" type="jack-midi" name="yoshimi MIDI IN">
    <plug>midi in</plug>
   </socket>
+  <socket exclusive="off" client="MDA ePiano" type="jack-midi" name="MDA ePiano IN">
+   <plug>event_in</plug>
+  </socket>
  </input-sockets>
  <slots/>
  <cables>
@@ -111,12 +120,16 @@
   <cable output="M48 Mix FX OUT" input="Headphones FX IN R" type="jack-audio"/>
   <cable output="M48 Drums FX OUT" input="Headphones FX IN R" type="jack-audio"/>
   <cable output="M48 Drums FX OUT" input="Headphones FX IN L" type="jack-audio"/>
-  <cable output="A2J MIDI OUT" input="yoshimi MIDI IN" type="jack-midi"/>
-  <cable output="Akai LPK25" input="A2J MIDI IN" type="alsa-midi"/>
   <cable output="yoshimi OUT L" input="Headphones FX IN L" type="jack-audio"/>
   <cable output="yoshimi OUT L" input="SEND" type="jack-audio"/>
   <cable output="yoshimi OUT L" input="Meter: Synth" type="jack-audio"/>
   <cable output="yoshimi OUT R" input="Headphones FX IN R" type="jack-audio"/>
+  <cable output="Akai LPK25" input="A2J MIDI IN" type="alsa-midi"/>
+  <cable output="A2J MIDI OUT" input="yoshimi MIDI IN" type="jack-midi"/>
+  <cable output="A2J MIDI OUT" input="MDA ePiano IN" type="jack-midi"/>
+  <cable output="MDA ePiano OUT L" input="Headphones FX IN L" type="jack-audio"/>
+  <cable output="MDA ePiano OUT L" input="Meter: Synth" type="jack-audio"/>
+  <cable output="MDA ePiano OUT R" input="Headphones FX IN R" type="jack-audio"/>
  </cables>
 </patchbay>
 
diff --git a/qjackctl-routing-settings/onboard.xml b/qjackctl-routing-settings/onboard.xml
index d5a38f1..143d800 100644
--- a/qjackctl-routing-settings/onboard.xml
+++ b/qjackctl-routing-settings/onboard.xml
@@ -1,68 +1,92 @@
 <!DOCTYPE patchbay>
-<patchbay name="onboard" version="0.4.2">
+<patchbay version="0.4.5" name="onboard">
  <output-sockets>
-  <socket type="jack-audio" name="Headphones OUT L" exclusive="off" client="jack_rack_headphones">
+  <socket exclusive="off" name="Headphones OUT L" client="jack_rack_headphones" type="jack-audio">
    <plug>out_1</plug>
   </socket>
-  <socket type="jack-audio" name="Headphones OUT R" exclusive="off" client="jack_rack_headphones">
+  <socket exclusive="off" name="Headphones OUT R" client="jack_rack_headphones" type="jack-audio">
    <plug>out_2</plug>
   </socket>
-  <socket type="jack-audio" name="Qsynth OUT L" exclusive="off" client="qsynth">
+  <socket exclusive="off" name="Qsynth OUT L" client="qsynth" type="jack-audio">
    <plug>l_00</plug>
   </socket>
-  <socket type="jack-audio" name="Qsynth OUT R" exclusive="off" client="qsynth">
+  <socket exclusive="off" name="Qsynth OUT R" client="qsynth" type="jack-audio">
    <plug>r_00</plug>
   </socket>
-  <socket type="jack-midi" name="jack-keyboard SEND" exclusive="off" client="jack-keyboard">
+  <socket exclusive="off" name="MDA EPiano OUT L" client="MDA ePiano" type="jack-audio">
+   <plug>left_out</plug>
+  </socket>
+  <socket exclusive="off" name="MDA EPiano OUT R" client="MDA ePiano" type="jack-audio">
+   <plug>right_out</plug>
+  </socket>
+  <socket exclusive="off" name="jack-keyboard SEND" client="jack-keyboard" type="jack-midi">
    <plug>midi_out</plug>
   </socket>
-  <socket type="alsa-midi" name="j2a_bridge OUT" exclusive="off" client="j2a_bridge">
-   <plug>capture</plug>
+  <socket exclusive="off" name="a2j ALSA OUT" client="Midi Through" type="alsa-midi">
+   <plug>Midi Through Port-0</plug>
   </socket>
-  <socket type="alsa-midi" name="Oxygen61" exclusive="off" client="Oxygen 61">
-   <plug>Oxygen 61 MIDI 1</plug>
+  <socket exclusive="off" name="a2j MIDI OUT" client="a2j" type="jack-midi">
+   <plug>Midi Through \[14\] \(capture\): Midi Through Port-0</plug>
   </socket>
-  <socket type="jack-audio" name="PulseAudio Sink L" exclusive="off" client="PulseAudio JACK Sink">
+  <socket exclusive="off" name="AKAI LPK25 Keyboard" client="LPK25" type="alsa-midi">
+   <plug>LPK25 MIDI 1</plug>
+  </socket>
+  <socket exclusive="off" name="Alesis Recital Keyboard" client="Alesis Recital" type="alsa-midi">
+   <plug>Alesis Recital MIDI 1</plug>
+  </socket>
+  <socket exclusive="off" name="PulseAudio Sink L" client="PulseAudio JACK Sink" type="jack-audio">
    <plug>front-left</plug>
   </socket>
-  <socket type="jack-audio" name="PulseAudio Sink R" exclusive="off" client="PulseAudio JACK Sink">
+  <socket exclusive="off" name="PulseAudio Sink R" client="PulseAudio JACK Sink" type="jack-audio">
    <plug>front-right</plug>
   </socket>
  </output-sockets>
  <input-sockets>
-  <socket type="jack-audio" name="Headphones IN L" exclusive="off" client="jack_rack_headphones">
+  <socket exclusive="off" name="Headphones IN L" client="jack_rack_headphones" type="jack-audio">
    <plug>in_1</plug>
   </socket>
-  <socket type="jack-audio" name="Headphones IN R" exclusive="off" client="jack_rack_headphones">
+  <socket exclusive="off" name="Headphones IN R" client="jack_rack_headphones" type="jack-audio">
    <plug>in_2</plug>
   </socket>
-  <socket type="jack-audio" name="Bass FX IN" exclusive="off" client="jack_rack_bass">
+  <socket exclusive="off" name="Bass FX IN" client="jack_rack_bass" type="jack-audio">
    <plug>in_1</plug>
   </socket>
-  <socket type="jack-audio" name="System OUT L" exclusive="off" client="system">
+  <socket exclusive="off" name="System OUT L" client="system" type="jack-audio">
    <plug>playback_1</plug>
   </socket>
-  <socket type="jack-audio" name="System OUT R" exclusive="off" client="system">
+  <socket exclusive="off" name="System OUT R" client="system" type="jack-audio">
    <plug>playback_2</plug>
   </socket>
-  <socket type="jack-midi" name="j2a_bridge IN" exclusive="off" client="j2a_bridge">
-   <plug>playback</plug>
+  <socket exclusive="off" name="a2j ALSA IN" client="Midi Through" type="alsa-midi">
+   <plug>Midi Through Port-0</plug>
   </socket>
-  <socket type="alsa-midi" name="FLUID Synth IN" exclusive="off" client="FLUID Synth \([0-9]+\)">
+  <socket exclusive="off" name="a2j MIDI IN" client="a2j" type="jack-midi">
+   <plug>Midi Through \[14\] \(playback\): Midi Through Port-0</plug>
+  </socket>
+  <socket exclusive="off" name="FLUID Synth IN" client="FLUID Synth \([0-9]+\)" type="alsa-midi">
    <plug>Synth input port \([0-9]+:0\)</plug>
   </socket>
+  <socket exclusive="off" name="MDA EPiano IN" client="MDA ePiano" type="jack-midi">
+   <plug>event_in</plug>
+  </socket>
  </input-sockets>
  <slots/>
  <cables>
-  <cable type="jack-audio" output="Headphones OUT L" input="System OUT L"/>
-  <cable type="jack-audio" output="Headphones OUT R" input="System OUT R"/>
-  <cable type="jack-audio" output="Qsynth OUT L" input="Headphones IN L"/>
-  <cable type="jack-audio" output="Qsynth OUT R" input="Headphones IN R"/>
-  <cable type="jack-midi" output="jack-keyboard SEND" input="j2a_bridge IN"/>
-  <cable type="alsa-midi" output="j2a_bridge OUT" input="FLUID Synth IN"/>
-  <cable type="alsa-midi" output="Oxygen61" input="FLUID Synth IN"/>
-  <cable type="jack-audio" output="PulseAudio Sink L" input="Headphones IN L"/>
-  <cable type="jack-audio" output="PulseAudio Sink R" input="Headphones IN R"/>
+  <cable input="System OUT L" output="Headphones OUT L" type="jack-audio"/>
+  <cable input="System OUT R" output="Headphones OUT R" type="jack-audio"/>
+  <cable input="Headphones IN L" output="Qsynth OUT L" type="jack-audio"/>
+  <cable input="Headphones IN R" output="Qsynth OUT R" type="jack-audio"/>
+  <cable input="Headphones IN L" output="MDA EPiano OUT L" type="jack-audio"/>
+  <cable input="Headphones IN R" output="MDA EPiano OUT R" type="jack-audio"/>
+  <cable input="MDA EPiano IN" output="jack-keyboard SEND" type="jack-midi"/>
+  <cable input="a2j MIDI IN" output="jack-keyboard SEND" type="jack-midi"/>
+  <cable input="FLUID Synth IN" output="a2j ALSA OUT" type="alsa-midi"/>
+  <cable input="MDA EPiano IN" output="a2j MIDI OUT" type="jack-midi"/>
+  <cable input="FLUID Synth IN" output="AKAI LPK25 Keyboard" type="alsa-midi"/>
+  <cable input="a2j ALSA IN" output="AKAI LPK25 Keyboard" type="alsa-midi"/>
+  <cable input="Headphones IN L" output="PulseAudio Sink L" type="jack-audio"/>
+  <cable input="Headphones IN R" output="PulseAudio Sink R" type="jack-audio"/>
+  <cable input="a2j ALSA IN" output="Alesis Recital Keyboard" type="alsa-midi"/>
  </cables>
 </patchbay>