From e6a81318f1dc5fb2f2d406e6b092fed2b572ff42 Mon Sep 17 00:00:00 2001
From: Ben Loftis <ben@harrisonconsoles.com>
Date: Mon, 1 Feb 2016 17:12:18 -0600
Subject: Generic MIDI: ffwd, rewd buttons should do the expected

---
 midi_maps/AKAI_MPKmini.map                  |  4 +-
 midi_maps/Korg_nanoKONTROL.map              |  4 +-
 midi_maps/Korg_nanoKONTROL2.map             |  5 +-
 midi_maps/Korg_nanoKONTROL2_With_Master.map |  4 +-
 midi_maps/Korg_nanoKONTROL_Master.map       |  4 +-
 midi_maps/Korg_taktile.map                  | 72 +++++++++++++++++++++++++++++
 midi_maps/M-Audio_Axiom25.map               |  4 +-
 midi_maps/M-Audio_Axiom61.map               |  4 +-
 midi_maps/M-Audio_Oxygen49.map              |  4 +-
 midi_maps/Novation Impulse 49.map           |  4 +-
 midi_maps/Novation_Impulse61.map            |  4 +-
 midi_maps/Novation_LaunchKey25.map          |  4 +-
 midi_maps/Roland_SI-24.map                  |  4 +-
 midi_maps/Roland_V_Studio_20.map            |  4 +-
 midi_maps/m-audio_oxygen25.map              |  4 +-
 midi_maps/m-audio_oxygen8v2.map             |  4 +-
 midi_maps/xboard-61.map                     |  6 +--
 17 files changed, 105 insertions(+), 34 deletions(-)
 create mode 100644 midi_maps/Korg_taktile.map

diff --git a/midi_maps/AKAI_MPKmini.map b/midi_maps/AKAI_MPKmini.map
index fbae78c873..29a9bc7318 100644
--- a/midi_maps/AKAI_MPKmini.map
+++ b/midi_maps/AKAI_MPKmini.map
@@ -30,10 +30,10 @@
 	<Binding channel="16" pgm="3" function="transport-stop"/>					<!-- STOP -->
 	<Binding channel="16" pgm="4" function="toggle-rec-enable"/>				<!-- REC -->
 
-	<Binding channel="16" pgm="5" function="transport-start"/>					<!-- BEGIN -->
+	<Binding channel="16" pgm="5" action="Transport/Rewind"/>					<!-- REWD -->
 	<Binding channel="16" pgm="6" action="Editor/jump-backward-to-mark"/> 		<!-- BACK -->
 	<Binding channel="16" pgm="7" action="Editor/jump-forward-to-mark"/> 		<!-- NEXT -->
-	<Binding channel="16" pgm="8" function="transport-end"/>					<!-- END -->
+	<Binding channel="16" pgm="8" action="Transport/Forward"/>					<!-- FFWD -->
 
 	<Binding channel="16" pgm="9" action="Editor/remove-last-capture"/>			<!-- Remove last capture -->
 	<Binding channel="16" pgm="10" action="Editor/jump-backward-to-mark"/>		<!--  -->
diff --git a/midi_maps/Korg_nanoKONTROL.map b/midi_maps/Korg_nanoKONTROL.map
index f0af7fc581..27e1fdcc53 100644
--- a/midi_maps/Korg_nanoKONTROL.map
+++ b/midi_maps/Korg_nanoKONTROL.map
@@ -8,8 +8,8 @@
   <Binding msg="B0 2c 7f" function="toggle-rec-enable"/>
   <Binding msg="B0 2d 7f" function="transport-roll"/>
   <Binding msg="B0 2e 7f" function="transport-stop"/>
-  <Binding msg="B0 2f 7f" function="transport-start"/>
-  <Binding msg="B0 30 7f" function="transport-end"/>
+  <Binding msg="B0 2f 7f" action="Transport/Rewind"/>
+  <Binding msg="B0 30 7f" action="Transport/Forward"/>
   <Binding msg="B0 31 7f" function="loop-toggle"/>
 
 <!-- The "Scene" button toggles between four banks. For this to work as     -->
diff --git a/midi_maps/Korg_nanoKONTROL2.map b/midi_maps/Korg_nanoKONTROL2.map
index f1c11566b0..8e3c43b9c5 100644
--- a/midi_maps/Korg_nanoKONTROL2.map
+++ b/midi_maps/Korg_nanoKONTROL2.map
@@ -12,9 +12,8 @@
 	
   <Binding channel="1" ctl="41" function="transport-roll"/>
   <Binding channel="1" ctl="42" function="transport-stop"/>
-  <Binding channel="1" ctl="43" function="transport-start"/>
-  <Binding channel="1" ctl="44" function="transport-end"/>
-  <Binding channel="1" ctl="44" function="transport-end"/>
+  <Binding channel="1" ctl="43" action="Transport/Rewind"/>
+  <Binding channel="1" ctl="44" action="Transport/Forward"/>
   <Binding channel="1" ctl="45" function="toggle-rec-enable"/>
   <Binding channel="1" ctl="46" function="loop-toggle"/>
   <Binding msg="B0 3c 7f" action="Editor/add-location-from-playhead"/>
diff --git a/midi_maps/Korg_nanoKONTROL2_With_Master.map b/midi_maps/Korg_nanoKONTROL2_With_Master.map
index 1217ca9b25..a8777ac782 100644
--- a/midi_maps/Korg_nanoKONTROL2_With_Master.map
+++ b/midi_maps/Korg_nanoKONTROL2_With_Master.map
@@ -13,8 +13,8 @@
 	
   <Binding channel="1" ctl="41" function="transport-roll"/>
   <Binding channel="1" ctl="42" function="transport-stop"/>
-  <Binding channel="1" ctl="43" function="transport-start"/>
-  <Binding channel="1" ctl="44" function="transport-end"/>
+  <Binding channel="1" ctl="43" action="Transport/Rewind"/>
+  <Binding channel="1" ctl="44" action="Transport/Forward"/>
   <Binding channel="1" ctl="45" function="toggle-rec-enable"/>
   <Binding channel="1" ctl="46" function="loop-toggle"/>
   <Binding msg="B0 3c 7f" action="Editor/add-location-from-playhead"/>
diff --git a/midi_maps/Korg_nanoKONTROL_Master.map b/midi_maps/Korg_nanoKONTROL_Master.map
index 04d0608c4d..864c603b94 100644
--- a/midi_maps/Korg_nanoKONTROL_Master.map
+++ b/midi_maps/Korg_nanoKONTROL_Master.map
@@ -11,8 +11,8 @@
   <Binding msg="B0 2c 7f" function="rec-enable"/>
   <Binding msg="B0 2d 7f" function="transport-roll"/>
   <Binding msg="B0 2e 7f" function="transport-stop"/>
-  <Binding msg="B0 2f 7f" function="transport-start"/>
-  <Binding msg="B0 30 7f" function="transport-end"/>
+  <Binding msg="B0 2f 7f" action="Transport/Rewind"/>
+  <Binding msg="B0 30 7f" action="Transport/Forward"/>
   <Binding msg="B0 31 7f" function="loop-toggle"/>
 
 <!-- The "Scene" button toggles between four banks. It implements this by   -->
diff --git a/midi_maps/Korg_taktile.map b/midi_maps/Korg_taktile.map
new file mode 100644
index 0000000000..bde3d2fa74
--- /dev/null
+++ b/midi_maps/Korg_taktile.map
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ArdourMIDIBindings version="1.1.0" name="Korg Taktile ( mode 9 )">
+
+  <DeviceInfo bank-size="8"/>
+	
+  <Binding channel="1" ctl="41" function="transport-roll"/>
+  <Binding channel="1" ctl="42" function="transport-stop"/>
+  <Binding channel="1" ctl="43" action="Transport/Rewind"/>
+  <Binding channel="1" ctl="44" action="Transport/Forward"/>
+  <Binding channel="1" ctl="45" function="toggle-rec-enable"/>
+  <Binding channel="1" ctl="46" function="loop-toggle"/>
+  <Binding msg="B0 3c 7f" action="Editor/add-location-from-playhead"/>
+  <Binding msg="B0 3d 7f" action="Editor/jump-backward-to-mark"/>
+  <Binding msg="B0 3e 7f" action="Editor/jump-forward-to-mark"/>
+  <Binding msg="B0 3a 7f" function="prev-bank"/>
+  <Binding msg="B0 3b 7f" function="next-bank"/>
+
+
+<!--  Channel controls:                         	 		--> 
+<!--  NOTE:  use mode #9, Generic MIDI to enable these 		--> 
+
+
+
+  <Binding channel="1" ctl="16" uri="/route/pandirection B1"/>	
+  <Binding channel="1" ctl="32" uri="/route/solo B1"/>
+  <Binding channel="1" ctl="48" uri="/route/mute B1"/>
+  <Binding channel="1" ctl="83" uri="/route/recenable B1"/>
+  <Binding channel="1" ctl="24" uri="/route/gain B1"/>
+  
+  <Binding channel="1" ctl="17" uri="/route/pandirection B2"/>
+  <Binding channel="1" ctl="33" uri="/route/solo B2"/>
+  <Binding channel="1" ctl="49" uri="/route/mute B2"/>
+  <Binding channel="1" ctl="84" uri="/route/recenable B2"/>
+  <Binding channel="1" ctl="25" uri="/route/gain B2"/>
+  
+  <Binding channel="1" ctl="18" uri="/route/pandirection B3"/>
+  <Binding channel="1" ctl="34" uri="/route/solo B3"/>
+  <Binding channel="1" ctl="50" uri="/route/mute B3"/>
+  <Binding channel="1" ctl="85" uri="/route/recenable B3"/>
+  <Binding channel="1" ctl="26" uri="/route/gain B3"/>
+  
+  <Binding channel="1" ctl="19" uri="/route/pandirection B4"/>
+  <Binding channel="1" ctl="35" uri="/route/solo B4"/>
+  <Binding channel="1" ctl="51" uri="/route/mute B4"/>
+  <Binding channel="1" ctl="86" uri="/route/recenable B4"/>
+  <Binding channel="1" ctl="27" uri="/route/gain B4"/>
+  
+  <Binding channel="1" ctl="20" uri="/route/pandirection B5"/>
+  <Binding channel="1" ctl="36" uri="/route/solo B5"/>
+  <Binding channel="1" ctl="52" uri="/route/mute B5"/>
+  <Binding channel="1" ctl="87" uri="/route/recenable B5"/>
+  <Binding channel="1" ctl="28" uri="/route/gain B5"/>
+  
+  <Binding channel="1" ctl="21" uri="/route/pandirection B6"/>
+  <Binding channel="1" ctl="37" uri="/route/solo B6"/>
+  <Binding channel="1" ctl="53" uri="/route/mute B6"/>
+  <Binding channel="1" ctl="88" uri="/route/recenable B6"/>
+  <Binding channel="1" ctl="29" uri="/route/gain B6"/>
+  
+  <Binding channel="1" ctl="22" uri="/route/pandirection B7"/>
+  <Binding channel="1" ctl="38" uri="/route/solo B7"/>
+  <Binding channel="1" ctl="54" uri="/route/mute B7"/>
+  <Binding channel="1" ctl="89" uri="/route/recenable B7"/>
+  <Binding channel="1" ctl="30" uri="/route/gain B7"/>
+  
+  <Binding channel="1" ctl="23" uri="/route/pandirection B8"/>
+  <Binding channel="1" ctl="39" uri="/route/solo B8"/>
+  <Binding channel="1" ctl="55" uri="/route/mute B8"/>
+  <Binding channel="1" ctl="90" uri="/route/recenable B8"/>
+  <Binding channel="1" ctl="31" uri="/route/gain B8"/>
+  
+ </ArdourMIDIBindings>
diff --git a/midi_maps/M-Audio_Axiom25.map b/midi_maps/M-Audio_Axiom25.map
index 001f7b1a00..8d7b3281fd 100644
--- a/midi_maps/M-Audio_Axiom25.map
+++ b/midi_maps/M-Audio_Axiom25.map
@@ -5,8 +5,8 @@
 
 <!-- Transport Controls -->
   <Binding channel="1" ctl="20" function="loop-toggle"/>
-  <Binding channel="1" ctl="21" function="transport-start"/>
-  <Binding channel="1" ctl="22" function="transport-end"/>
+  <Binding channel="1" ctl="21" action="Transport/Rewind"/>
+  <Binding channel="1" ctl="22" action="Transport/Forward"/>
   <Binding channel="1" ctl="23" function="transport-stop"/>
   <Binding channel="1" ctl="24" function="transport-roll"/>
   <Binding channel="1" ctl="25" function="toggle-rec-enable"/>
diff --git a/midi_maps/M-Audio_Axiom61.map b/midi_maps/M-Audio_Axiom61.map
index 7945870d55..9ea9caaf91 100644
--- a/midi_maps/M-Audio_Axiom61.map
+++ b/midi_maps/M-Audio_Axiom61.map
@@ -42,8 +42,8 @@
 
 <!-- Transport controls -->
 
-  <Binding channel="1" ctl="21" function="transport-start"/>
-  <Binding channel="1" ctl="22" function="transport-end"/>
+  <Binding channel="1" ctl="21" action="Transport/Rewind"/>
+  <Binding channel="1" ctl="22" action="Transport/Forward"/>
   <Binding channel="1" ctl="23" function="transport-stop"/>
   <Binding channel="1" ctl="24" function="transport-roll"/>
   <Binding channel="1" ctl="20" function="loop-toggle"/>
diff --git a/midi_maps/M-Audio_Oxygen49.map b/midi_maps/M-Audio_Oxygen49.map
index 6f4fb8d94c..18341a0bd7 100644
--- a/midi_maps/M-Audio_Oxygen49.map
+++ b/midi_maps/M-Audio_Oxygen49.map
@@ -5,8 +5,8 @@
 
 <!-- Transport controls -->
   <Binding msg="bf 71 7f"         function="loop-toggle"/>
-  <Binding msg="bf 72 7f"         function="transport-start"/>
-  <Binding msg="bf 73 7f"         function="transport-end"/>
+  <Binding msg="bf 72 7f"         action="Transport/Rewind"/>
+  <Binding msg="bf 73 7f"         action="Transport/Forward"/>
   <Binding msg="bf 74 7f"         function="transport-stop"/>
   <Binding msg="bf 75 7f"         function="transport-roll"/>
   <Binding msg="bf 76 7f"         action="Transport/record-roll"/>
diff --git a/midi_maps/Novation Impulse 49.map b/midi_maps/Novation Impulse 49.map
index 234991e41b..534549c457 100644
--- a/midi_maps/Novation Impulse 49.map	
+++ b/midi_maps/Novation Impulse 49.map	
@@ -5,8 +5,8 @@
 
 <!-- Transport Control -->
 
-  <Binding channel="1" ctl="112" function="transport-start"/>
-  <Binding channel="1" ctl="113" function="transport-end"/>
+  <Binding channel="1" ctl="112" action="Transport/Rewind"/>
+  <Binding channel="1" ctl="113" action="Transport/Forward"/>
   <Binding channel="1" ctl="114" function="transport-stop"/>
   <Binding channel="1" ctl="115" function="transport-roll"/>
   <Binding channel="1" ctl="116" function="loop-toggle"/>
diff --git a/midi_maps/Novation_Impulse61.map b/midi_maps/Novation_Impulse61.map
index 78e0d4c548..8bd26a61bb 100644
--- a/midi_maps/Novation_Impulse61.map
+++ b/midi_maps/Novation_Impulse61.map
@@ -6,8 +6,8 @@
 
 <!-- Transport controls -->
 
-  <Binding channel="1" ctl="112" function="transport-start"/>
-  <Binding channel="1" ctl="113" function="transport-end"/>
+  <Binding channel="1" ctl="112" action="Transport/Rewind"/>
+  <Binding channel="1" ctl="113" action="Transport/Forward"/>
   <Binding channel="1" ctl="114" function="transport-stop"/>
   <Binding channel="1" ctl="115" function="transport-roll"/>
   <Binding channel="1" ctl="116" function="loop-toggle"/>
diff --git a/midi_maps/Novation_LaunchKey25.map b/midi_maps/Novation_LaunchKey25.map
index ded8a2cfbf..a74f5069ad 100644
--- a/midi_maps/Novation_LaunchKey25.map
+++ b/midi_maps/Novation_LaunchKey25.map
@@ -3,8 +3,8 @@
 
 <!-- Transport controls -->
 
-  <Binding channel="1" ctl="112" function="transport-start"/>
-  <Binding channel="1" ctl="113" function="transport-end"/>
+  <Binding channel="1" ctl="112" action="Transport/Rewind"/>
+  <Binding channel="1" ctl="113" action="Transport/Forward"/>
   <Binding channel="1" ctl="114" function="transport-stop"/>
   <Binding channel="1" ctl="115" function="transport-roll"/>
   <Binding channel="1" ctl="116" function="loop-toggle"/>
diff --git a/midi_maps/Roland_SI-24.map b/midi_maps/Roland_SI-24.map
index 40aa03a486..d60cb6c1f1 100644
--- a/midi_maps/Roland_SI-24.map
+++ b/midi_maps/Roland_SI-24.map
@@ -114,8 +114,8 @@
 
 	<!-- Transport buttons -->
 	<Binding channel="1" note="84" function="transport-stop"/>	<!-- PAUSE -->
-	<Binding channel="1" note="85" function="transport-stop"/>	<!-- REW -->
-	<Binding channel="1" note="86" function="transport-start"/>	<!-- FF -->
+	<Binding channel="1" note="85" action="Transport/Rewind"/>	<!-- REW -->
+	<Binding channel="1" note="86" action="Transport/Forward"/>	<!-- FF -->
 	<Binding channel="1" note="87" function="transport-end"/>		<!-- STOP -->
 	<Binding channel="1" note="88" function="transport-roll"/>	<!-- PLAY -->
 	<Binding channel="1" note="89" function="toggle-rec-enable"/>		<!-- REC -->
diff --git a/midi_maps/Roland_V_Studio_20.map b/midi_maps/Roland_V_Studio_20.map
index 5e1eea152b..0fb458e45c 100644
--- a/midi_maps/Roland_V_Studio_20.map
+++ b/midi_maps/Roland_V_Studio_20.map
@@ -8,8 +8,8 @@
 <Binding channel="1" note="46" function="next-bank" momentary="yes"/>
 <!-- Transport controls -->
 <Binding channel="2" note="33" action="Transport/GotoZero" momentary="yes"/>  <!-- Fix for non-working transport-zero action -->
-<Binding channel="1" note="91" function="transport-start" momentary="yes"/>
-<Binding channel="1" note="92" function="transport-end" momentary="yes"/>
+<Binding channel="1" note="91" action="Transport/Rewind" momentary="yes"/>
+<Binding channel="1" note="92" action="Transport/Forward" momentary="yes"/>
 <Binding channel="1" note="93" function="transport-stop" momentary="yes"/>
 <Binding channel="1" note="94" function="transport-roll" momentary="yes"/>
 <Binding channel="1" note="95" action="Transport/Record"  momentary="yes"/> <!-- Makes record toggle -->
diff --git a/midi_maps/m-audio_oxygen25.map b/midi_maps/m-audio_oxygen25.map
index f3d545dca5..0457284ad0 100644
--- a/midi_maps/m-audio_oxygen25.map
+++ b/midi_maps/m-audio_oxygen25.map
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ArdourMIDIBindings version="1.0.0" name="M-Audio Oxygen25 (factory default)">
   <Binding msg="bf 71 7f"         function="loop-toggle"/>
-  <Binding msg="bf 72 7f"         function="transport-start"/>
-  <Binding msg="bf 73 7f"         function="transport-end"/>
+  <Binding msg="bf 72 7f"         action="Transport/Rewind"/>
+  <Binding msg="bf 73 7f"         action="Transport/Forward"/>
   <Binding msg="bf 74 7f"         function="transport-stop"/>
   <Binding msg="bf 75 7f"         function="transport-roll"/>
   <Binding msg="bf 76 7f"         action="Transport/record-roll"/>
diff --git a/midi_maps/m-audio_oxygen8v2.map b/midi_maps/m-audio_oxygen8v2.map
index 549276b426..8e7262a5e3 100644
--- a/midi_maps/m-audio_oxygen8v2.map
+++ b/midi_maps/m-audio_oxygen8v2.map
@@ -2,8 +2,8 @@
 <ArdourMIDIBindings version="1.0.0" name="M-Audio Oxygen8 V2">
   <DeviceInfo bank-size="8"/>
   <Binding channel="1" ctl="20" function="loop-toggle"/>
-  <Binding channel="1" ctl="21" function="transport-start"/>
-  <Binding channel="1" ctl="22" function="transport-end"/>
+  <Binding channel="1" ctl="21" action="Transport/Rewind"/>
+  <Binding channel="1" ctl="22" action="Transport/Forward"/>
   <Binding channel="1" ctl="23" function="transport-stop"/>
   <Binding channel="1" ctl="24" function="transport-roll"/>
   <Binding channel="1" ctl="25" function="toggle-rec-enable"/>
diff --git a/midi_maps/xboard-61.map b/midi_maps/xboard-61.map
index 61928a9a06..f990460e4a 100644
--- a/midi_maps/xboard-61.map
+++ b/midi_maps/xboard-61.map
@@ -67,7 +67,7 @@ NOTE:	I have assumed that the top row knobs are mapped to midi
 	<Binding channel="1" note="36" function="loop-toggle"/>
 	<Binding channel="1" note="38" function="transport-roll"/>
 	<Binding channel="1" note="40" function="transport-stop"/>
-	<Binding channel="1" note="37" function="transport-start"/>
-	<Binding channel="1" note="39" function="transport-end"/>
+	<Binding channel="1" note="37" action="Transport/Rewind"/>
+	<Binding channel="1" note="39" action="Transport/Forward"/>
 
-</ArdourMIDIBindings>
\ No newline at end of file
+</ArdourMIDIBindings>
-- 
cgit v1.2.3