replace top row of looping samplers with hotcues 5-8

* Remove top row of looping samplers
* Change one shot samplers to Samplers 1-8
* Move rest of small button grid up one row
* Make bottom row control hotcues 5-8

Eventually, the bottom row should start loops at hotcues 5-8, but that
is not working yet because of lp:1464003

1 files changed, 48 insertions, 48 deletions

diff --git a/res/controllers/Electrix Tweaker.midi.xml b/res/controllers/Electrix Tweaker.midi.xml
index 35a41f596b..02ae221924 100644
--- a/res/controllers/Electrix Tweaker.midi.xml
+++ b/res/controllers/Electrix Tweaker.midi.xml
@@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         </scriptfiles>
         <controls>
             <control>
-                <group>[Sampler1]</group>
-                <key>ElectrixTweaker.loop</key>
+                <group>[Channel1]</group>
+                <key>ElectrixTweaker.beatjumpBackward</key>
                 <status>0x90</status>
                 <midino>0x01</midino>
                 <options>
@@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler2]</group>
-                <key>ElectrixTweaker.loop</key>
+                <group>[Channel1]</group>
+                <key>ElectrixTweaker.beatjumpForward</key>
                 <status>0x90</status>
                 <midino>0x02</midino>
                 <options>
@@ -48,8 +48,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler3]</group>
-                <key>ElectrixTweaker.loop</key>
+                <group>[Channel1]</group>
+                <key>ElectrixTweaker.backButton</key>
                 <status>0x90</status>
                 <midino>0x03</midino>
                 <options>
@@ -57,8 +57,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler4]</group>
-                <key>ElectrixTweaker.loop</key>
+                <group>[Channel1]</group>
+                <key>ElectrixTweaker.forwardButton</key>
                 <status>0x90</status>
                 <midino>0x04</midino>
                 <options>
@@ -66,8 +66,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler5]</group>
-                <key>ElectrixTweaker.loop</key>
+                <group>[Channel2]</group>
+                <key>ElectrixTweaker.beatjumpBackward</key>
                 <status>0x90</status>
                 <midino>0x05</midino>
                 <options>
@@ -75,8 +75,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler6]</group>
-                <key>ElectrixTweaker.loop</key>
+                <group>[Channel2]</group>
+                <key>ElectrixTweaker.beatjumpForward</key>
                 <status>0x90</status>
                 <midino>0x06</midino>
                 <options>
@@ -84,8 +84,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler7]</group>
-                <key>ElectrixTweaker.loop</key>
+                <group>[Channel2]</group>
+                <key>ElectrixTweaker.backButton</key>
                 <status>0x90</status>
                 <midino>0x07</midino>
                 <options>
@@ -93,8 +93,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler8]</group>
-                <key>ElectrixTweaker.loop</key>
+                <group>[Channel2]</group>
+                <key>ElectrixTweaker.forwardButton</key>
                 <status>0x90</status>
                 <midino>0x08</midino>
                 <options>
@@ -103,7 +103,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel1]</group>
-                <key>ElectrixTweaker.beatjumpBackward</key>
+                <key>ElectrixTweaker.deckToggle</key>
                 <status>0x90</status>
                 <midino>0x09</midino>
                 <options>
@@ -112,7 +112,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel1]</group>
-                <key>ElectrixTweaker.beatjumpForward</key>
+                <key>ElectrixTweaker.sync</key>
                 <status>0x90</status>
                 <midino>0x0A</midino>
                 <options>
@@ -121,7 +121,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel1]</group>
-                <key>ElectrixTweaker.backButton</key>
+                <key>ElectrixTweaker.quantize</key>
                 <status>0x90</status>
                 <midino>0x0B</midino>
                 <options>
@@ -130,7 +130,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel1]</group>
-                <key>ElectrixTweaker.forwardButton</key>
+                <key>ElectrixTweaker.keylock</key>
                 <status>0x90</status>
                 <midino>0x0C</midino>
                 <options>
@@ -139,7 +139,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel2]</group>
-                <key>ElectrixTweaker.beatjumpBackward</key>
+                <key>ElectrixTweaker.deckToggle</key>
                 <status>0x90</status>
                 <midino>0x0D</midino>
                 <options>
@@ -148,7 +148,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel2]</group>
-                <key>ElectrixTweaker.beatjumpForward</key>
+                <key>ElectrixTweaker.sync</key>
                 <status>0x90</status>
                 <midino>0x0E</midino>
                 <options>
@@ -157,7 +157,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel2]</group>
-                <key>ElectrixTweaker.backButton</key>
+                <key>ElectrixTweaker.quantize</key>
                 <status>0x90</status>
                 <midino>0x0F</midino>
                 <options>
@@ -166,7 +166,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel2]</group>
-                <key>ElectrixTweaker.forwardButton</key>
+                <key>ElectrixTweaker.keylock</key>
                 <status>0x90</status>
                 <midino>0x10</midino>
                 <options>
@@ -175,7 +175,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel1]</group>
-                <key>ElectrixTweaker.deckToggle</key>
+                <key>ElectrixTweaker.hotcueButton</key>
                 <status>0x90</status>
                 <midino>0x11</midino>
                 <options>
@@ -184,7 +184,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel1]</group>
-                <key>ElectrixTweaker.sync</key>
+                <key>ElectrixTweaker.hotcueButton</key>
                 <status>0x90</status>
                 <midino>0x12</midino>
                 <options>
@@ -193,7 +193,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel1]</group>
-                <key>ElectrixTweaker.quantize</key>
+                <key>ElectrixTweaker.hotcueButton</key>
                 <status>0x90</status>
                 <midino>0x13</midino>
                 <options>
@@ -202,7 +202,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel1]</group>
-                <key>ElectrixTweaker.keylock</key>
+                <key>ElectrixTweaker.hotcueButton</key>
                 <status>0x90</status>
                 <midino>0x14</midino>
                 <options>
@@ -211,7 +211,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel2]</group>
-                <key>ElectrixTweaker.deckToggle</key>
+                <key>ElectrixTweaker.hotcueButton</key>
                 <status>0x90</status>
                 <midino>0x15</midino>
                 <options>
@@ -220,7 +220,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel2]</group>
-                <key>ElectrixTweaker.sync</key>
+                <key>ElectrixTweaker.hotcueButton</key>
                 <status>0x90</status>
                 <midino>0x16</midino>
                 <options>
@@ -229,7 +229,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel2]</group>
-                <key>ElectrixTweaker.quantize</key>
+                <key>ElectrixTweaker.hotcueButton</key>
                 <status>0x90</status>
                 <midino>0x17</midino>
                 <options>
@@ -238,7 +238,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel2]</group>
-                <key>ElectrixTweaker.keylock</key>
+                <key>ElectrixTweaker.hotcueButton</key>
                 <status>0x90</status>
                 <midino>0x18</midino>
                 <options>
@@ -247,7 +247,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel1]</group>
-                <key>ElectrixTweaker.hotcueButton</key>
+                <key>ElectrixTweaker.loop</key>
                 <status>0x90</status>
                 <midino>0x19</midino>
                 <options>
@@ -256,7 +256,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel1]</group>
-                <key>ElectrixTweaker.hotcueButton</key>
+                <key>ElectrixTweaker.loop</key>
                 <status>0x90</status>
                 <midino>0x1A</midino>
                 <options>
@@ -265,7 +265,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel1]</group>
-                <key>ElectrixTweaker.hotcueButton</key>
+                <key>ElectrixTweaker.loop</key>
                 <status>0x90</status>
                 <midino>0x1B</midino>
                 <options>
@@ -274,7 +274,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel1]</group>
-                <key>ElectrixTweaker.hotcueButton</key>
+                <key>ElectrixTweaker.loop</key>
                 <status>0x90</status>
                 <midino>0x1C</midino>
                 <options>
@@ -283,7 +283,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel2]</group>
-                <key>ElectrixTweaker.hotcueButton</key>
+                <key>ElectrixTweaker.loop</key>
                 <status>0x90</status>
                 <midino>0x1D</midino>
                 <options>
@@ -292,7 +292,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel2]</group>
-                <key>ElectrixTweaker.hotcueButton</key>
+                <key>ElectrixTweaker.loop</key>
                 <status>0x90</status>
                 <midino>0x1E</midino>
                 <options>
@@ -301,7 +301,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel2]</group>
-                <key>ElectrixTweaker.hotcueButton</key>
+                <key>ElectrixTweaker.loop</key>
                 <status>0x90</status>
                 <midino>0x1F</midino>
                 <options>
@@ -310,7 +310,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </control>
             <control>
                 <group>[Channel2]</group>
-                <key>ElectrixTweaker.hotcueButton</key>
+                <key>ElectrixTweaker.loop</key>
                 <status>0x90</status>
                 <midino>0x20</midino>
                 <options>
@@ -606,7 +606,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler9]</group>
+                <group>[Sampler1]</group>
                 <key>ElectrixTweaker.oneShot</key>
                 <status>0x90</status>
                 <midino>0x3F</midino>
@@ -615,7 +615,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler10]</group>
+                <group>[Sampler2]</group>
                 <key>ElectrixTweaker.oneShot</key>
                 <status>0x90</status>
                 <midino>0x40</midino>
@@ -624,7 +624,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler11]</group>
+                <group>[Sampler3]</group>
                 <key>ElectrixTweaker.oneShot</key>
                 <status>0x90</status>
                 <midino>0x41</midino>
@@ -633,7 +633,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler12]</group>
+                <group>[Sampler4]</group>
                 <key>ElectrixTweaker.oneShot</key>
                 <status>0x90</status>
                 <midino>0x42</midino>
@@ -642,7 +642,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler13]</group>
+                <group>[Sampler5]</group>
                 <key>ElectrixTweaker.oneShot</key>
                 <status>0x90</status>
                 <midino>0x43</midino>
@@ -651,7 +651,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler14]</group>
+                <group>[Sampler6]</group>
                 <key>ElectrixTweaker.oneShot</key>
                 <status>0x90</status>
                 <midino>0x44</midino>
@@ -660,7 +660,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler15]</group>
+                <group>[Sampler7]</group>
                 <key>ElectrixTweaker.oneShot</key>
                 <status>0x90</status>
                 <midino>0x45</midino>
@@ -669,7 +669,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </options>
             </control>
             <control>
-                <group>[Sampler16]</group>
+                <group>[Sampler8]</group>
                 <key>ElectrixTweaker.oneShot</key>
                 <status>0x90</status>
                 <midino>0x46</midino>