From fd2861cb5f9f6959c7d1c91b841602577a7f6198 Mon Sep 17 00:00:00 2001
From: David Runge <dave@sleepmap.de>
Date: Mon, 19 Mar 2018 22:58:16 +0100
Subject: classes/{NanoKontrol2,PlatformMPlus}.sc: Fixing adding of elements to
 reflect connectStates and created MIDIdefs in MIDIDevice.

---
 classes/NanoKontrol2.sc  | 105 ++++++++--------
 classes/PlatformMPlus.sc | 308 +++++++++++++++++++++++------------------------
 2 files changed, 205 insertions(+), 208 deletions(-)

diff --git a/classes/NanoKontrol2.sc b/classes/NanoKontrol2.sc
index 43fafe0..71c3f7f 100644
--- a/classes/NanoKontrol2.sc
+++ b/classes/NanoKontrol2.sc
@@ -12,6 +12,7 @@ NanoKontrol2 : MIDIDevice{
     this.addFaders();
     this.addPotis();
     this.addButtons();
+    super.connectStates();
   }
 
   cleanup{
@@ -22,182 +23,182 @@ NanoKontrol2 : MIDIDevice{
   addButtons{
     buttons.put(0,
       List.newUsing([
-        super.addSpec(\channel1Select, \control, 32, 0, 127),
+        super.addSpec(\channel1Select, \control, 0, 32, 0, 127),
       ]);
     );
     buttons.put(1,
       List.newUsing([
-        super.addSpec(\channel2Select, \control, 33, 0, 127),
+        super.addSpec(\channel2Select, \control, 0, 33, 0, 127),
       ]);
     );
     buttons.put(2,
       List.newUsing([
-        super.addSpec(\channel3Select, \control, 34, 0, 127),
+        super.addSpec(\channel3Select, \control, 0, 34, 0, 127),
       ]);
     );
     buttons.put(3,
       List.newUsing([
-        super.addSpec(\channel4Select, \control, 35, 0, 127),
+        super.addSpec(\channel4Select, \control, 0, 35, 0, 127),
       ]);
     );
     buttons.put(4,
       List.newUsing([
-        super.addSpec(\channel5Select, \control, 36, 0, 127),
+        super.addSpec(\channel5Select, \control, 0, 36, 0, 127),
       ]);
     );
     buttons.put(5,
       List.newUsing([
-        super.addSpec(\channel6Select, \control, 37, 0, 127),
+        super.addSpec(\channel6Select, \control, 0, 37, 0, 127),
       ]);
     );
     buttons.put(6,
       List.newUsing([
-        super.addSpec(\channel7Select, \control, 38, 0, 127),
+        super.addSpec(\channel7Select, \control, 0, 38, 0, 127),
       ]);
     );
     buttons.put(7,
       List.newUsing([
-        super.addSpec(\channel8Select, \control, 39, 0, 127),
+        super.addSpec(\channel8Select, \control, 0, 39, 0, 127),
       ]);
     );
     buttons.put(8,
       List.newUsing([
-        super.addSpec(\channel1Mute, \control, 48, 0, 127),
+        super.addSpec(\channel1Mute, \control, 0, 48, 0, 127),
       ]);
     );
     buttons.put(9,
       List.newUsing([
-        super.addSpec(\channel2Mute, \control, 49, 0, 127),
+        super.addSpec(\channel2Mute, \control, 0, 49, 0, 127),
       ]);
     );
     buttons.put(10,
       List.newUsing([
-        super.addSpec(\channel3Mute, \control, 50, 0, 127),
+        super.addSpec(\channel3Mute, \control, 0, 50, 0, 127),
       ]);
     );
     buttons.put(11,
       List.newUsing([
-        super.addSpec(\channel4Mute, \control, 51, 0, 127),
+        super.addSpec(\channel4Mute, \control, 0, 51, 0, 127),
       ]);
     );
     buttons.put(12,
       List.newUsing([
-        super.addSpec(\channel5Mute, \control, 52, 0, 127),
+        super.addSpec(\channel5Mute, \control, 0, 52, 0, 127),
       ]);
     );
     buttons.put(13,
       List.newUsing([
-        super.addSpec(\channel6Mute, \control, 53, 0, 127),
+        super.addSpec(\channel6Mute, \control, 0, 53, 0, 127),
       ]);
     );
     buttons.put(14,
       List.newUsing([
-        super.addSpec(\channel7Mute, \control, 54, 0, 127),
+        super.addSpec(\channel7Mute, \control, 0, 54, 0, 127),
       ]);
     );
     buttons.put(15,
       List.newUsing([
-        super.addSpec(\channel8Mute, \control, 55, 0, 127),
+        super.addSpec(\channel8Mute, \control, 0, 55, 0, 127),
       ]);
     );
     buttons.put(16,
       List.newUsing([
-        super.addSpec(\channel1Record, \control, 64, 0, 127),
+        super.addSpec(\channel1Record, \control, 0, 64, 0, 127),
       ]);
     );
     buttons.put(17,
       List.newUsing([
-        super.addSpec(\channel2Record, \control, 65, 0, 127),
+        super.addSpec(\channel2Record, \control, 0, 65, 0, 127),
       ]);
     );
     buttons.put(18,
       List.newUsing([
-        super.addSpec(\channel3Record, \control, 66, 0, 127),
+        super.addSpec(\channel3Record, \control, 0, 66, 0, 127),
       ]);
     );
     buttons.put(19,
       List.newUsing([
-        super.addSpec(\channel4Record, \control, 67, 0, 127),
+        super.addSpec(\channel4Record, \control, 0, 67, 0, 127),
       ]);
     );
     buttons.put(20,
       List.newUsing([
-        super.addSpec(\channel5Record, \control, 68, 0, 127),
+        super.addSpec(\channel5Record, \control, 0, 68, 0, 127),
       ]);
     );
     buttons.put(21,
       List.newUsing([
-        super.addSpec(\channel6Record, \control, 69, 0, 127),
+        super.addSpec(\channel6Record, \control, 0, 69, 0, 127),
       ]);
     );
     buttons.put(22,
       List.newUsing([
-        super.addSpec(\channel7Record, \control, 70, 0, 127),
+        super.addSpec(\channel7Record, \control, 0, 70, 0, 127),
       ]);
     );
     buttons.put(23,
       List.newUsing([
-        super.addSpec(\channel8Record, \control, 71, 0, 127),
+        super.addSpec(\channel8Record, \control, 0, 71, 0, 127),
       ]);
     );
     buttons.put(24,
       List.newUsing([
-        super.addSpec(\channel8Record, \control, 71, 0, 127),
+        super.addSpec(\channel8Record, \control, 0, 71, 0, 127),
       ]);
     );
     buttons.put(25,
       List.newUsing([
-        super.addSpec(\trackDown, \control, 58, 0, 127),
+        super.addSpec(\trackDown, \control, 0, 58, 0, 127),
       ]);
     );
     buttons.put(26,
       List.newUsing([
-        super.addSpec(\trackUp, \control, 59, 0, 127),
+        super.addSpec(\trackUp, \control, 0, 59, 0, 127),
       ]);
     );
     buttons.put(27,
       List.newUsing([
-        super.addSpec(\cycle, \control, 46, 0, 127),
+        super.addSpec(\cycle, \control, 0, 46, 0, 127),
       ]);
     );
     buttons.put(28,
       List.newUsing([
-        super.addSpec(\backwards, \control, 43, 0, 127),
+        super.addSpec(\backwards, \control, 0, 43, 0, 127),
       ]);
     );
     buttons.put(29,
       List.newUsing([
-        super.addSpec(\forwards, \control, 44, 0, 127),
+        super.addSpec(\forwards, \control, 0, 44, 0, 127),
       ]);
     );
     buttons.put(30,
       List.newUsing([
-        super.addSpec(\set, \control, 60, 0, 127),
+        super.addSpec(\set, \control, 0, 60, 0, 127),
       ]);
     );
     buttons.put(31,
       List.newUsing([
-        super.addSpec(\markerDown, \control, 61, 0, 127),
+        super.addSpec(\markerDown, \control, 0, 61, 0, 127),
       ]);
     );
     buttons.put(32,
       List.newUsing([
-        super.addSpec(\markerUp, \control, 62, 0, 127),
+        super.addSpec(\markerUp, \control, 0, 62, 0, 127),
       ]);
     );
     buttons.put(33,
       List.newUsing([
-        super.addSpec(\stop, \control, 42, 0, 127),
+        super.addSpec(\stop, \control, 0, 42, 0, 127),
       ]);
     );
     buttons.put(34,
       List.newUsing([
-        super.addSpec(\play, \control, 41, 0, 127),
+        super.addSpec(\play, \control, 0, 41, 0, 127),
       ]);
     );
     buttons.put(35,
       List.newUsing([
-        super.addSpec(\record, \control, 45, 0, 127),
+        super.addSpec(\record, \control, 0, 45, 0, 127),
       ]);
     );
   }
@@ -205,42 +206,42 @@ NanoKontrol2 : MIDIDevice{
   addPotis{
     potis.put(0,
       List.newUsing([
-        super.addSpec(\poti1, \control, 16, 0, 127),
+        super.addSpec(\poti1, \control, 0, 16, 0, 127),
       ]);
     );
     potis.put(1,
       List.newUsing([
-        super.addSpec(\poti2, \control, 17, 0, 127),
+        super.addSpec(\poti2, \control, 0, 17, 0, 127),
       ]);
     );
     potis.put(2,
       List.newUsing([
-        super.addSpec(\poti3, \control, 18, 0, 127),
+        super.addSpec(\poti3, \control, 0, 18, 0, 127),
       ]);
     );
     potis.put(3,
       List.newUsing([
-        super.addSpec(\poti4, \control, 19, 0, 127),
+        super.addSpec(\poti4, \control, 0, 19, 0, 127),
       ]);
     );
     potis.put(4,
       List.newUsing([
-        super.addSpec(\poti5, \control, 20, 0, 127),
+        super.addSpec(\poti5, \control, 0, 20, 0, 127),
       ]);
     );
     potis.put(5,
       List.newUsing([
-        super.addSpec(\poti6, \control, 21, 0, 127),
+        super.addSpec(\poti6, \control, 0, 21, 0, 127),
       ]);
     );
     potis.put(6,
       List.newUsing([
-        super.addSpec(\poti7, \control, 22, 0, 127),
+        super.addSpec(\poti7, \control, 0, 22, 0, 127),
       ]);
     );
     potis.put(7,
       List.newUsing([
-        super.addSpec(\poti8, \control, 23, 0, 127),
+        super.addSpec(\poti8, \control, 0, 23, 0, 127),
       ]);
     );
   }
@@ -248,42 +249,42 @@ NanoKontrol2 : MIDIDevice{
   addFaders{
     faders.put(0,
       List.newUsing([
-        super.addSpec(\fader1, \control, 0, 0, 127),
+        super.addSpec(\fader1, \control, 0, 0, 0, 127),
       ]);
     );
     faders.put(1,
       List.newUsing([
-        super.addSpec(\fader2, \control, 1, 0, 127),
+        super.addSpec(\fader2, \control, 0, 1, 0, 127),
       ]);
     );
     faders.put(2,
       List.newUsing([
-        super.addSpec(\fader3, \control, 2, 0, 127),
+        super.addSpec(\fader3, \control, 0, 2, 0, 127),
       ]);
     );
     faders.put(3,
       List.newUsing([
-        super.addSpec(\fader4, \control, 3, 0, 127),
+        super.addSpec(\fader4, \control, 0, 3, 0, 127),
       ]);
     );
     faders.put(4,
       List.newUsing([
-        super.addSpec(\fader5, \control, 4, 0, 127),
+        super.addSpec(\fader5, \control, 0, 4, 0, 127),
       ]);
     );
     faders.put(5,
       List.newUsing([
-        super.addSpec(\fader6, \control, 5, 0, 127),
+        super.addSpec(\fader6, \control, 0, 5, 0, 127),
       ]);
     );
     faders.put(6,
       List.newUsing([
-        super.addSpec(\fader7, \control, 6, 0, 127),
+        super.addSpec(\fader7, \control, 0, 6, 0, 127),
       ]);
     );
     faders.put(7,
       List.newUsing([
-        super.addSpec(\fader8, \control, 7, 0, 127),
+        super.addSpec(\fader8, \control, 0, 7, 0, 127),
       ]);
     );
   }
diff --git a/classes/PlatformMPlus.sc b/classes/PlatformMPlus.sc
index 999786d..0236ded 100644
--- a/classes/PlatformMPlus.sc
+++ b/classes/PlatformMPlus.sc
@@ -4,9 +4,10 @@ PlatformMPlus : MIDIDevice{
     arg name, uid, inPort, outPort, verbose, states;
     var faderSize = 9,
     potiSize = 8,
-    buttonSize = 48,
+    buttonSize = 47,
     jogwheelSize = 1;
-    ^super.new(name, uid, inPort, outPort, verbose, states, faderSize, potiSize, buttonSize, jogwheelSize).init;
+    ^super.new(name, uid, inPort, outPort, verbose, states, faderSize,
+      potiSize, buttonSize, jogwheelSize).init;
   }
 
   init{
@@ -16,6 +17,7 @@ PlatformMPlus : MIDIDevice{
     this.addButtons();
     this.addPassThroughs();
     super.connectPassThroughs();
+    super.connectStates();
   }
 
   cleanup{
@@ -39,290 +41,284 @@ PlatformMPlus : MIDIDevice{
   addButtons{
     buttons.put(0,
       List.newUsing([
-        super.addSpec(\channel1RecNoteOn, \noteOn, 0, 0, 127),
-        super.addSpec(\channel1RecNoteOff, \noteOff, 0, 0, 127),
+        super.addSpec(\channel1RecNoteOn, \noteOn, 0, 0, 0, 127),
+        super.addSpec(\channel1RecNoteOff, \noteOff, 0, 0, 0, 127),
       ]);
     );
     buttons.put(1,
       List.newUsing([
-        super.addSpec(\channel2RecNoteOn, \noteOn, 1, 0, 127),
-        super.addSpec(\channel2RecNoteOff, \noteOff, 1, 0, 127),
+        super.addSpec(\channel2RecNoteOn, \noteOn, 0, 1, 0, 127),
+        super.addSpec(\channel2RecNoteOff, \noteOff, 0, 1, 0, 127),
       ]);
     );
     buttons.put(2,
       List.newUsing([
-        super.addSpec(\channel3RecNoteOn, \noteOn, 2, 0, 127),
-        super.addSpec(\channel3RecNoteOff, \noteOff, 2, 0, 127),
+        super.addSpec(\channel3RecNoteOn, \noteOn, 0, 2, 0, 127),
+        super.addSpec(\channel3RecNoteOff, \noteOff, 0, 2, 0, 127),
       ]);
     );
     buttons.put(3,
       List.newUsing([
-        super.addSpec(\channel4RecNoteOn, \noteOn, 3, 0, 127),
-        super.addSpec(\channel4RecNoteOff, \noteOff, 3, 0, 127),
+        super.addSpec(\channel4RecNoteOn, \noteOn, 0, 3, 0, 127),
+        super.addSpec(\channel4RecNoteOff, \noteOff, 0, 3, 0, 127),
       ]);
     );
     buttons.put(4,
       List.newUsing([
-        super.addSpec(\channel5RecNoteOn, \noteOn, 4, 0, 127),
-        super.addSpec(\channel5RecNoteOff, \noteOff, 4, 0, 127),
+        super.addSpec(\channel5RecNoteOn, \noteOn, 0, 4, 0, 127),
+        super.addSpec(\channel5RecNoteOff, \noteOff, 0, 4, 0, 127),
       ]);
     );
     buttons.put(5,
       List.newUsing([
-        super.addSpec(\channel6RecNoteOn, \noteOn, 5, 0, 127),
-        super.addSpec(\channel6RecNoteOff, \noteOff, 5, 0, 127127),
+        super.addSpec(\channel6RecNoteOn, \noteOn, 0, 5, 0, 127),
+        super.addSpec(\channel6RecNoteOff, \noteOff, 0, 5, 0, 127127),
       ]);
     );
     buttons.put(6,
       List.newUsing([
-        super.addSpec(\channel7RecNoteOn, \noteOn, 6, 0, 127),
-        super.addSpec(\channel7RecNoteOff, \noteOff, 6, 0, 127),
+        super.addSpec(\channel7RecNoteOn, \noteOn, 0, 6, 0, 127),
+        super.addSpec(\channel7RecNoteOff, \noteOff, 0, 6, 0, 127),
       ]);
     );
     buttons.put(7,
       List.newUsing([
-        super.addSpec(\channel8RecNoteOn, \noteOn, 7, 0, 127),
-        super.addSpec(\channel8RecNoteOff, \noteOff, 7, 0, 127),
+        super.addSpec(\channel8RecNoteOn, \noteOn, 0, 7, 0, 127),
+        super.addSpec(\channel8RecNoteOff, \noteOff, 0, 7, 0, 127),
       ]);
     );
     buttons.put(8,
       List.newUsing([
-        super.addSpec(\channel1SoloNoteOn, \noteOn, 8, 0, 127),
-        super.addSpec(\channel1SoloNoteOff, \noteOff, 8, 0, 127),
+        super.addSpec(\channel1SoloNoteOn, \noteOn, 0, 8, 0, 127),
+        super.addSpec(\channel1SoloNoteOff, \noteOff, 0, 8, 0, 127),
       ]);
     );
     buttons.put(9,
       List.newUsing([
-        super.addSpec(\channel2SoloNoteOn, \noteOn, 9, 0, 127),
-        super.addSpec(\channel2SoloNoteOff, \noteOff, 9, 0, 127),
+        super.addSpec(\channel2SoloNoteOn, \noteOn, 0, 9, 0, 127),
+        super.addSpec(\channel2SoloNoteOff, \noteOff, 0, 9, 0, 127),
       ]);
     );
     buttons.put(10,
       List.newUsing([
-        super.addSpec(\channel3SoloNoteOn, \noteOn, 10, 0, 127),
-        super.addSpec(\channel3SoloNoteOff, \noteOff, 10, 0, 127),
+        super.addSpec(\channel3SoloNoteOn, \noteOn, 0, 10, 0, 127),
+        super.addSpec(\channel3SoloNoteOff, \noteOff, 0, 10, 0, 127),
       ]);
     );
     buttons.put(11,
       List.newUsing([
-        super.addSpec(\channel4SoloNoteOn, \noteOn, 11, 0, 127),
-        super.addSpec(\channel4SoloNoteOff, \noteOff, 11, 0, 127),
+        super.addSpec(\channel4SoloNoteOn, \noteOn, 0, 11, 0, 127),
+        super.addSpec(\channel4SoloNoteOff, \noteOff, 0, 11, 0, 127),
       ]);
     );
     buttons.put(12,
       List.newUsing([
-        super.addSpec(\channel5SoloNoteOn, \noteOn, 12, 0, 127),
-        super.addSpec(\channel5SoloNoteOff, \noteOff, 12, 0, 127),
+        super.addSpec(\channel5SoloNoteOn, \noteOn, 0, 12, 0, 127),
+        super.addSpec(\channel5SoloNoteOff, \noteOff, 0, 12, 0, 127),
       ]);
     );
     buttons.put(13,
       List.newUsing([
-        super.addSpec(\channel6SoloNoteOn, \noteOn, 13, 0, 127),
-        super.addSpec(\channel6SoloNoteOff, \noteOff, 13, 0, 127),
+        super.addSpec(\channel6SoloNoteOn, \noteOn, 0, 13, 0, 127),
+        super.addSpec(\channel6SoloNoteOff, \noteOff, 0, 13, 0, 127),
       ]);
     );
     buttons.put(14,
       List.newUsing([
-        super.addSpec(\channel7SoloNoteOn, \noteOn, 14, 0, 127),
-        super.addSpec(\channel7SoloNoteOff, \noteOff, 14, 0, 127),
+        super.addSpec(\channel7SoloNoteOn, \noteOn, 0, 14, 0, 127),
+        super.addSpec(\channel7SoloNoteOff, \noteOff, 0, 14, 0, 127),
       ]);
     );
     buttons.put(15,
       List.newUsing([
-        super.addSpec(\channel8SoloNoteOn, \noteOn, 15, 0, 127),
-        super.addSpec(\channel8SoloNoteOff, \noteOff, 15, 0, 127),
+        super.addSpec(\channel8SoloNoteOn, \noteOn, 0, 15, 0, 127),
+        super.addSpec(\channel8SoloNoteOff, \noteOff, 0, 15, 0, 127),
       ]);
     );
     buttons.put(16,
       List.newUsing([
-        super.addSpec(\channel1MuteNoteOn, \noteOn, 16, 0, 127),
-        super.addSpec(\channel1MuteNoteOff, \noteOff, 16, 0, 127),
+        super.addSpec(\channel1MuteNoteOn, \noteOn, 0, 16, 0, 127),
+        super.addSpec(\channel1MuteNoteOff, \noteOff, 0, 16, 0, 127),
       ]);
     );
     buttons.put(17,
       List.newUsing([
-        super.addSpec(\channel2MuteNoteOn, \noteOn, 17, 0, 127),
-        super.addSpec(\channel2MuteNoteOff, \noteOff, 17, 0, 127),
+        super.addSpec(\channel2MuteNoteOn, \noteOn, 0, 17, 0, 127),
+        super.addSpec(\channel2MuteNoteOff, \noteOff, 0, 17, 0, 127),
       ]);
     );
     buttons.put(18,
       List.newUsing([
-        super.addSpec(\channel3MuteNoteOn, \noteOn, 18, 0, 127),
-        super.addSpec(\channel3MuteNoteOff, \noteOff, 18, 0, 127),
+        super.addSpec(\channel3MuteNoteOn, \noteOn, 0, 18, 0, 127),
+        super.addSpec(\channel3MuteNoteOff, \noteOff, 0, 18, 0, 127),
       ]);
     );
     buttons.put(19,
       List.newUsing([
-        super.addSpec(\channel4MuteNoteOn, \noteOn, 19, 0, 127),
-        super.addSpec(\channel4MuteNoteOff, \noteOff, 19, 0, 127),
+        super.addSpec(\channel4MuteNoteOn, \noteOn, 0, 19, 0, 127),
+        super.addSpec(\channel4MuteNoteOff, \noteOff, 0, 19, 0, 127),
       ]);
     );
     buttons.put(20,
       List.newUsing([
-        super.addSpec(\channel5MuteNoteOn, \noteOn, 20, 0, 127),
-        super.addSpec(\channel5MuteNoteOff, \noteOff, 20, 0, 127),
+        super.addSpec(\channel5MuteNoteOn, \noteOn, 0, 20, 0, 127),
+        super.addSpec(\channel5MuteNoteOff, \noteOff, 0, 20, 0, 127),
       ]);
     );
     buttons.put(21,
       List.newUsing([
-        super.addSpec(\channel6MuteNoteOn, \noteOn, 21, 0, 127),
-        super.addSpec(\channel6MuteNoteOff, \noteOff, 21, 0, 127),
+        super.addSpec(\channel6MuteNoteOn, \noteOn, 0, 21, 0, 127),
+        super.addSpec(\channel6MuteNoteOff, \noteOff, 0, 21, 0, 127),
       ]);
     );
     buttons.put(22,
       List.newUsing([
-        super.addSpec(\channel7MuteNoteOn, \noteOn, 22, 0, 127),
-        super.addSpec(\channel7MuteNoteOff, \noteOff, 22, 0, 127),
+        super.addSpec(\channel7MuteNoteOn, \noteOn, 0, 22, 0, 127),
+        super.addSpec(\channel7MuteNoteOff, \noteOff, 0, 22, 0, 127),
       ]);
     );
     buttons.put(23,
       List.newUsing([
-        super.addSpec(\channel8MuteNoteOn, \noteOn, 23, 0, 127),
-        super.addSpec(\channel8MuteNoteOff, \noteOff, 23, 0, 127),
+        super.addSpec(\channel8MuteNoteOn, \noteOn, 0, 23, 0, 127),
+        super.addSpec(\channel8MuteNoteOff, \noteOff, 0, 23, 0, 127),
       ]);
     );
     buttons.put(24,
       List.newUsing([
-        super.addSpec(\channel1SelectNoteOn, \noteOn, 24, 0, 127),
-        super.addSpec(\channel1SelectNoteOff, \noteOff, 24, 0, 127),
+        super.addSpec(\channel1SelectNoteOn, \noteOn, 0, 24, 0, 127),
+        super.addSpec(\channel1SelectNoteOff, \noteOff, 0, 24, 0, 127),
       ]);
     );
     buttons.put(25,
       List.newUsing([
-        super.addSpec(\channel2SelectNoteOn, \noteOn, 25, 0, 127),
-        super.addSpec(\channel2SelectNoteOff, \noteOff, 25, 0, 127),
+        super.addSpec(\channel2SelectNoteOn, \noteOn, 0, 25, 0, 127),
+        super.addSpec(\channel2SelectNoteOff, \noteOff, 0, 25, 0, 127),
       ]);
     );
     buttons.put(26,
       List.newUsing([
-        super.addSpec(\channel3SelectNoteOn, \noteOn, 26, 0, 127),
-        super.addSpec(\channel3SelectNoteOff, \noteOff, 26, 0, 127),
+        super.addSpec(\channel3SelectNoteOn, \noteOn, 0, 26, 0, 127),
+        super.addSpec(\channel3SelectNoteOff, \noteOff, 0, 26, 0, 127),
       ]);
     );
     buttons.put(27,
       List.newUsing([
-        super.addSpec(\channel4SelectNoteOn, \noteOn, 27, 0, 127),
-        super.addSpec(\channel4SelectNoteOff, \noteOff, 27, 0, 127),
+        super.addSpec(\channel4SelectNoteOn, \noteOn, 0, 27, 0, 127),
+        super.addSpec(\channel4SelectNoteOff, \noteOff, 0, 27, 0, 127),
       ]);
     );
     buttons.put(28,
       List.newUsing([
-        super.addSpec(\channel5SelectNoteOn, \noteOn, 28, 0, 127),
-        super.addSpec(\channel5SelectNoteOff, \noteOff, 28, 0, 127),
+        super.addSpec(\channel5SelectNoteOn, \noteOn, 0, 28, 0, 127),
+        super.addSpec(\channel5SelectNoteOff, \noteOff, 0, 28, 0, 127),
       ]);
     );
     buttons.put(29,
       List.newUsing([
-        super.addSpec(\channel6SelectNoteOn, \noteOn, 29, 0, 127),
-        super.addSpec(\channel6SelectNoteOff, \noteOff, 29, 0, 127),
+        super.addSpec(\channel6SelectNoteOn, \noteOn, 0, 29, 0, 127),
+        super.addSpec(\channel6SelectNoteOff, \noteOff, 0, 29, 0, 127),
       ]);
     );
     buttons.put(30,
       List.newUsing([
-        super.addSpec(\channel7SelectNoteOn, \noteOn, 30, 0, 127),
-        super.addSpec(\channel7SelectNoteOff, \noteOff, 30, 0, 127),
+        super.addSpec(\channel7SelectNoteOn, \noteOn, 0, 30, 0, 127),
+        super.addSpec(\channel7SelectNoteOff, \noteOff, 0, 30, 0, 127),
       ]);
     );
     buttons.put(31,
       List.newUsing([
-        super.addSpec(\channel8SelectNoteOn, \noteOn, 31, 0, 127),
-        super.addSpec(\channel8SelectNoteOff, \noteOff, 31, 0, 127),
+        super.addSpec(\channel8SelectNoteOn, \noteOn, 0, 31, 0, 127),
+        super.addSpec(\channel8SelectNoteOff, \noteOff, 0, 31, 0, 127),
       ]);
     );
     buttons.put(32,
       List.newUsing([
-        super.addSpec(\channel8SelectNoteOn, \noteOn, 31, 0, 127),
-        super.addSpec(\channel8SelectNoteOff, \noteOff, 31, 0, 127),
+        super.addSpec(\channel8SelectNoteOn, \noteOn, 0, 31, 0, 127),
+        super.addSpec(\channel8SelectNoteOff, \noteOff, 0, 31, 0, 127),
       ]);
     );
     buttons.put(33,
       List.newUsing([
-        super.addSpec(\flipBankDownNoteOn, \noteOn, 46, 0, 127),
-        super.addSpec(\flipBankDownNoteOff, \noteOff, 46, 0, 127),
+        super.addSpec(\bankDownNoteOn, \noteOn, 0, 46, 0, 127),
+        super.addSpec(\bankDownNoteOff, \noteOff, 0, 46, 0, 127),
       ]);
     );
     buttons.put(34,
       List.newUsing([
-        super.addSpec(\flipBankUpNoteOn, \noteOn, 47, 0, 127),
-        super.addSpec(\flipBankUpNoteOff, \noteOff, 47, 0, 127),
+        super.addSpec(\bankUpNoteOn, \noteOn, 0, 47, 0, 127),
+        super.addSpec(\bankUpNoteOff, \noteOff, 0, 47, 0, 127),
       ]);
     );
     buttons.put(35,
       List.newUsing([
-        super.addSpec(\flipChanDownNoteOn, \noteOn, 48, 0, 127),
-        super.addSpec(\flipChanDownNoteOff, \noteOff, 48, 0, 127),
+        super.addSpec(\chanDownNoteOn, \noteOn, 0, 48, 0, 127),
+        super.addSpec(\chanDownNoteOff, \noteOff, 0, 48, 0, 127),
       ]);
     );
     buttons.put(36,
       List.newUsing([
-        super.addSpec(\flipChanUpNoteOn, \noteOn, 49, 0, 127),
-        super.addSpec(\flipChanUpNoteOff, \noteOff, 49, 0, 127),
+        super.addSpec(\chanUpNoteOn, \noteOn, 0, 49, 0, 127),
+        super.addSpec(\chanUpNoteOff, \noteOff, 0, 49, 0, 127),
       ]);
     );
     buttons.put(37,
       List.newUsing([
-        super.addSpec(\flipChanUpNoteOn, \noteOn, 49, 0, 127),
-        super.addSpec(\flipChanUpNoteOff, \noteOff, 49, 0, 127),
+        super.addSpec(\readNoteOn, \noteOn, 0, 74, 0, 127),
+        super.addSpec(\readNoteOff, \noteOff, 0, 74, 0, 127),
       ]);
     );
     buttons.put(38,
       List.newUsing([
-        super.addSpec(\readNoteOn, \noteOn, 74, 0, 127),
-        super.addSpec(\readNoteOff, \noteOff, 74, 0, 127),
+        super.addSpec(\writeNoteOn, \noteOn, 0, 75, 0, 127),
+        super.addSpec(\writeNoteOff, \noteOff, 0, 75, 0, 127),
       ]);
     );
     buttons.put(39,
       List.newUsing([
-        super.addSpec(\writeNoteOn, \noteOn, 75, 0, 127),
-        super.addSpec(\writeNoteOff, \noteOff, 75, 0, 127),
+        super.addSpec(\mixerNoteOn, \noteOn, 0, 78, 0, 127),
+        super.addSpec(\mixerNoteOff, \noteOff, 0, 78, 0, 127),
       ]);
     );
     buttons.put(40,
       List.newUsing([
-        super.addSpec(\mixerNoteOn, \noteOn, 78, 0, 127),
-        super.addSpec(\mixerNoteOff, \noteOff, 78, 0, 127),
+        super.addSpec(\rewindNoteOn, \noteOn, 0, 86, 0, 127),
+        super.addSpec(\rewindNoteOff, \noteOff, 0, 86, 0, 127),
       ]);
     );
     buttons.put(41,
       List.newUsing([
-        super.addSpec(\rewindNoteOn, \noteOn, 86, 0, 127),
-        super.addSpec(\rewindNoteOff, \noteOff, 86, 0, 127),
+        super.addSpec(\transDownNoteOn, \noteOn, 0, 91, 0, 127),
+        super.addSpec(\transDownNoteOff, \noteOff, 0, 91, 0, 127),
       ]);
     );
     buttons.put(42,
       List.newUsing([
-        super.addSpec(\transDownNoteOn, \noteOn, 91, 0, 127),
-        super.addSpec(\transDownNoteOff, \noteOff, 91, 0, 127),
+        super.addSpec(\transUpNoteOn, \noteOn, 0, 92, 0, 127),
+        super.addSpec(\transUpNoteOff, \noteOff, 0, 92, 0, 127),
       ]);
     );
     buttons.put(43,
       List.newUsing([
-        super.addSpec(\transUpNoteOn, \noteOn, 92, 0, 127),
-        super.addSpec(\transUpNoteOff, \noteOff, 92, 0, 127),
+        super.addSpec(\stopNoteOn, \noteOn, 0, 93, 0, 127),
+        super.addSpec(\stopNoteOff, \noteOff, 0, 93, 0, 127),
       ]);
     );
     buttons.put(44,
       List.newUsing([
-        super.addSpec(\stopNoteOn, \noteOn, 93, 0, 127),
-        super.addSpec(\stopNoteOff, \noteOff, 93, 0, 127),
+        super.addSpec(\playNoteOn, \noteOn, 0, 94, 0, 127),
+        super.addSpec(\playNoteOff, \noteOff, 0, 94, 0, 127),
       ]);
     );
     buttons.put(45,
       List.newUsing([
-        super.addSpec(\playNoteOn, \noteOn, 94, 0, 127),
-        super.addSpec(\playNoteOff, \noteOff, 94, 0, 127),
+        super.addSpec(\recordNoteOn, \noteOn, 0, 95, 0, 127),
+        super.addSpec(\recordNoteOff, \noteOff, 0, 95, 0, 127),
       ]);
     );
     buttons.put(46,
       List.newUsing([
-        super.addSpec(\recordNoteOn, \noteOn, 95, 0, 127),
-        super.addSpec(\recordNoteOff, \noteOff, 95, 0, 127),
-      ]);
-    );
-    buttons.put(47,
-      List.newUsing([
-        super.addSpec(\zoomNoteOn, \noteOn, 100, 0, 127),
-        super.addSpec(\zoomNoteOff, \noteOff, 100, 0, 127),
+        super.addSpec(\zoomNoteOn, \noteOn, 0, 100, 0, 127),
+        super.addSpec(\zoomNoteOff, \noteOff, 0, 100, 0, 127),
       ]);
     );
   }
@@ -330,9 +326,9 @@ PlatformMPlus : MIDIDevice{
   addJogwheels{
     jogwheels.put(0,
       List.newUsing([
-        super.addSpec(\jogwheel1Control, \control, 60, 0, 127),
-        super.addSpec(\jogwheel1NoteOn, \noteOn, 101, 0, 127),
-        super.addSpec(\jogwheel1NoteOff, \noteOff, 101, 0, 127)
+        super.addSpec(\jogwheel1Control, \control, 0, 60, 0, 127),
+        super.addSpec(\jogwheel1NoteOn, \noteOn, 0, 101, 0, 127),
+        super.addSpec(\jogwheel1NoteOff, \noteOff, 0, 101, 0, 127)
       ])
     );
   }
@@ -340,58 +336,58 @@ PlatformMPlus : MIDIDevice{
   addPotis{
     potis.put(0,
       List.newUsing([
-        super.addSpec(\poti1Control, \control, 16, 0, 127),
-        super.addSpec(\poti1NoteOn, \noteOn, 32, 0, 127),
-        super.addSpec(\poti1NoteOff, \noteOff, 32, 0, 127)
+        super.addSpec(\nonLinearPoti1Control, \control, 0, 16, 0, 127),
+        super.addSpec(\poti1NoteOn, \noteOn, 0, 32, 0, 127),
+        super.addSpec(\poti1NoteOff, \noteOff, 0, 32, 0, 127)
       ])
     );
     potis.put(1,
       List.newUsing([
-        super.addSpec(\poti2Control, \control, 17, 0, 127),
-        super.addSpec(\poti2NoteOn, \noteOn, 33, 0, 127),
-        super.addSpec(\poti2NoteOff, \noteOff, 33, 0, 127)
+        super.addSpec(\nonLinearPoti2Control, \control, 0, 17, 0, 127),
+        super.addSpec(\poti2NoteOn, \noteOn, 0, 33, 0, 127),
+        super.addSpec(\poti2NoteOff, \noteOff, 0, 33, 0, 127)
       ])
     );
     potis.put(2,
       List.newUsing([
-        super.addSpec(\poti3Control, \control, 18, 0, 127),
-        super.addSpec(\poti3NoteOn, \noteOn, 34, 0, 127),
-        super.addSpec(\poti3NoteOff, \noteOff, 34, 0, 127)
+        super.addSpec(\nonLinearPoti3Control, \control, 0, 18, 0, 127),
+        super.addSpec(\poti3NoteOn, \noteOn, 0, 34, 0, 127),
+        super.addSpec(\poti3NoteOff, \noteOff, 0, 34, 0, 127)
       ])
     );
     potis.put(3,
       List.newUsing([
-        super.addSpec(\poti4Control, \control, 19, 0, 127),
-        super.addSpec(\poti4NoteOn, \noteOn, 35, 0, 127),
-        super.addSpec(\poti4NoteOff, \noteOff, 35, 0, 127)
+        super.addSpec(\nonLinearPoti4Control, \control, 0, 19, 0, 127),
+        super.addSpec(\poti4NoteOn, \noteOn, 0, 35, 0, 127),
+        super.addSpec(\poti4NoteOff, \noteOff, 0, 35, 0, 127)
       ])
     );
     potis.put(4,
       List.newUsing([
-        super.addSpec(\poti5Control, \control, 20, 0, 127),
-        super.addSpec(\poti5NoteOn, \noteOn, 36, 0, 127),
-        super.addSpec(\poti5NoteOff, \noteOff, 36, 0, 127)
+        super.addSpec(\nonLinearPoti5Control, \control, 0, 20, 0, 127),
+        super.addSpec(\poti5NoteOn, \noteOn, 0, 36, 0, 127),
+        super.addSpec(\poti5NoteOff, \noteOff, 0, 36, 0, 127)
       ])
     );
     potis.put(5,
       List.newUsing([
-        super.addSpec(\poti6Control, \control, 21, 0, 127),
-        super.addSpec(\poti6NoteOn, \noteOn, 37, 0, 127),
-        super.addSpec(\poti6NoteOff, \noteOff, 37, 0, 127)
+        super.addSpec(\nonLinearPoti6Control, \control, 0, 21, 0, 127),
+        super.addSpec(\poti6NoteOn, \noteOn, 0, 37, 0, 127),
+        super.addSpec(\poti6NoteOff, \noteOff, 0, 37, 0, 127)
       ])
     );
     potis.put(6,
       List.newUsing([
-        super.addSpec(\poti7Control, \control, 22, 0, 127),
-        super.addSpec(\poti7NoteOn, \noteOn, 38, 0, 127),
-        super.addSpec(\poti7NoteOff, \noteOff, 38, 0, 127)
+        super.addSpec(\nonLinearPoti7Control, \control, 0, 22, 0, 127),
+        super.addSpec(\poti7NoteOn, \noteOn, 0, 38, 0, 127),
+        super.addSpec(\poti7NoteOff, \noteOff, 0, 38, 0, 127)
       ])
     );
     potis.put(7,
       List.newUsing([
-        super.addSpec(\poti8Control, \control, 23, 0, 127),
-        super.addSpec(\poti8NoteOn, \noteOn, 39, 0, 127),
-        super.addSpec(\poti8NoteOff, \noteOff, 39, 0, 127)
+        super.addSpec(\nonLinearPoti8Control, \control, 0, 23, 0, 127),
+        super.addSpec(\poti8NoteOn, \noteOn, 0, 39, 0, 127),
+        super.addSpec(\poti8NoteOff, \noteOff, 0, 39, 0, 127)
       ])
     );
   }
@@ -399,65 +395,65 @@ PlatformMPlus : MIDIDevice{
   addFaders{
     faders.put(0,
       List.newUsing([
-        super.addSpec(\fader1, \bend, 0, 0, 16383),
-        super.addSpec(\fader1NoteOn, \noteOn, 104, 0, 127),
-        super.addSpec(\fader1NoteOff, \noteOff, 104, 0, 127)
+        super.addSpec(\fader1, \bend, 0, Nil, 0, 16383),
+        super.addSpec(\fader1NoteOn, \noteOn, 0, 104, 0, 127),
+        super.addSpec(\fader1NoteOff, \noteOff, 0, 104, 0, 127)
       ])
     );
     faders.put(1,
       List.newUsing([
-        super.addSpec(\fader2, \bend, 1, 0, 16383),
-        super.addSpec(\fader2NoteOn, \noteOn, 105, 0, 127),
-        super.addSpec(\fader2NoteOff, \noteOff, 105, 0, 127)
+        super.addSpec(\fader2, \bend, 1, Nil, 0, 16383),
+        super.addSpec(\fader2NoteOn, \noteOn, 0, 105, 0, 127),
+        super.addSpec(\fader2NoteOff, \noteOff, 0, 105, 0, 127)
       ])
     );
     faders.put(2,
       List.newUsing([
-        super.addSpec(\fader3, \bend, 2, 0, 16383),
-        super.addSpec(\fader3NoteOn, \noteOn, 106, 0, 127),
-        super.addSpec(\fader3NoteOff, \noteOff, 106, 0, 127)
+        super.addSpec(\fader3, \bend, 2, Nil, 0, 16383),
+        super.addSpec(\fader3NoteOn, \noteOn, 0, 106, 0, 127),
+        super.addSpec(\fader3NoteOff, \noteOff, 0, 106, 0, 127)
       ])
     );
     faders.put(3,
       List.newUsing([
-        super.addSpec(\fader4, \bend, 3, 0, 16383),
-        super.addSpec(\fader4NoteOn, \noteOn, 107, 0, 127),
-        super.addSpec(\fader4NoteOff, \noteOff, 107, 0, 127)
+        super.addSpec(\fader4, \bend, 3, Nil, 0, 16383),
+        super.addSpec(\fader4NoteOn, \noteOn, 0, 107, 0, 127),
+        super.addSpec(\fader4NoteOff, \noteOff, 0, 107, 0, 127)
       ])
     );
     faders.put(4,
       List.newUsing([
-        super.addSpec(\fader5, \bend, 4, 0, 16383),
-        super.addSpec(\fader5NoteOn, \noteOn, 108, 0, 127),
-        super.addSpec(\fader5NoteOff, \noteOff, 108, 0, 127)
+        super.addSpec(\fader5, \bend, 4, Nil, 0, 16383),
+        super.addSpec(\fader5NoteOn, \noteOn, 0, 108, 0, 127),
+        super.addSpec(\fader5NoteOff, \noteOff, 0, 108, 0, 127)
       ])
     );
     faders.put(5,
       List.newUsing([
-        super.addSpec(\fader6, \bend, 5, 0, 16383),
-        super.addSpec(\fader6NoteOn, \noteOn, 109, 0, 127),
-        super.addSpec(\fader6NoteOff, \noteOff, 109, 0, 127)
+        super.addSpec(\fader6, \bend, 5, Nil, 0, 16383),
+        super.addSpec(\fader6NoteOn, \noteOn, 0, 109, 0, 127),
+        super.addSpec(\fader6NoteOff, \noteOff, 0, 109, 0, 127)
       ])
     );
     faders.put(6,
       List.newUsing([
-        super.addSpec(\fader7, \bend, 6, 0, 16383),
-        super.addSpec(\fader7NoteOn, \noteOn, 110, 0, 127),
-        super.addSpec(\fader7NoteOff, \noteOff, 110, 0, 127)
+        super.addSpec(\fader7, \bend, 6, Nil, 0, 16383),
+        super.addSpec(\fader7NoteOn, \noteOn, 0, 110, 0, 127),
+        super.addSpec(\fader7NoteOff, \noteOff, 0, 110, 0, 127)
       ])
     );
     faders.put(7,
       List.newUsing([
-        super.addSpec(\fader8, \bend, 7, 0, 16383),
-        super.addSpec(\fader8NoteOn, \noteOn, 111, 0, 127),
-        super.addSpec(\fader8NoteOff, \noteOff, 111, 0, 127)
+        super.addSpec(\fader8, \bend, 7, Nil, 0, 16383),
+        super.addSpec(\fader8NoteOn, \noteOn, 0, 111, 0, 127),
+        super.addSpec(\fader8NoteOff, \noteOff, 0, 111, 0, 127)
       ])
     );
     faders.put(8,
       List.newUsing([
-        super.addSpec(\fader9, \bend, 8, 0, 16383),
-        super.addSpec(\fader9NoteOn, \noteOn, 112, 0, 127),
-        super.addSpec(\fader9NoteOff, \noteOff, 112, 0, 127)
+        super.addSpec(\fader9, \bend, 8, Nil, 0, 16383),
+        super.addSpec(\fader9NoteOn, \noteOn, 0, 112, 0, 127),
+        super.addSpec(\fader9NoteOff, \noteOff, 0, 112, 0, 127)
       ])
     );
   }
-- 
cgit v1.2.3-70-g09d2