From 7ce9a6fbe1df3087ecdd03793bb766f06b3001d8 Mon Sep 17 00:00:00 2001
From: Be <be@mixxx.org>
Date: Sun, 4 Mar 2018 09:39:20 -0600
Subject: [PATCH] American Audio VMS2 & VMS4/4.1: unmap volume faders

These devices combine a MIDI controller and hardware mixer.
Unfortunately there is no way to decouple these different functions
except for bypassing the VMS' equalizers. In Mixxx 2.1, the
umixed Deck 1-4 outputs were changed so they are now affected by the
deck volume faders. This was done because effects are now processed
after the volume faders. Sending the output signals to the Deck 1-4
outputs before the volume fader would make effects unusable with
external mixers. (Alternatively, it would be possible to do duplicate
effects processing before the volume faders for the Deck 1-4 outputs
like what is done for the Headphones output, but that would
complicate the mixing engine code and of course the software
volume fader could not be used to cut input to effects.)
---
 res/controllers/American Audio VMS2.midi.xml | 27 ------------
 res/controllers/American Audio VMS4.midi.xml | 46 --------------------
 2 files changed, 73 deletions(-)

diff --git a/res/controllers/American Audio VMS2.midi.xml b/res/controllers/American Audio VMS2.midi.xml
index 1bed46ebb85..338f1a61e70 100644
--- a/res/controllers/American Audio VMS2.midi.xml	
+++ b/res/controllers/American Audio VMS2.midi.xml	
@@ -1267,15 +1267,6 @@
 	</options>
       </control>
       <!-- Mixer main-->
-      <control>
-	<group>[Master]</group>
-	<key>crossfader</key>
-	<status>0xB0</status>
-	<midino>0x1F</midino>
-	<options>
-	  <invert/>
-	</options>
-      </control>
       <control>
 	<group>[Master]</group>
 	<key>headMix</key>
@@ -1349,15 +1340,6 @@
 	  <!-- soft-takeover /-->
 	</options>
       </control>
-      <control>
-	<group>[Channel1]</group>
-	<key>volume</key>
-	<status>0xB0</status>
-	<midino>0x04</midino>
-	<options>
-	  <!-- soft-takeover /-->
-	</options>
-      </control>
       <control>
 	<!-- on -->
 	<group>[Channel1]</group>
@@ -1415,15 +1397,6 @@
 	  <!-- soft-takeover /-->
 	</options>
       </control>
-      <control>
-	<group>[Channel2]</group>
-	<key>volume</key>
-	<status>0xB0</status>
-	<midino>0x09</midino>
-	<options>
-	  <!-- soft-takeover /-->
-	</options>
-      </control>
       <control>
 	<!-- on -->
 	<group>[Channel2]</group>
diff --git a/res/controllers/American Audio VMS4.midi.xml b/res/controllers/American Audio VMS4.midi.xml
index 660aa37b348..564863598b0 100644
--- a/res/controllers/American Audio VMS4.midi.xml	
+++ b/res/controllers/American Audio VMS4.midi.xml	
@@ -1352,16 +1352,6 @@
          </control>
 
          <!-- Mixer main-->
-         <control>
-            <group>[Master]</group>
-            <key>crossfader</key>
-            <status>0xB0</status>
-            <midino>0x1F</midino>
-            <options>
-               <invert/>
-               <soft-takeover/>
-            </options>
-         </control>
          <control>
             <group>[Master]</group>
             <key>headMix</key>
@@ -1436,15 +1426,6 @@
                 <soft-takeover />
             </options>
          </control>
-         <control>
-            <group>[Channel1]</group>
-            <key>volume</key>
-            <status>0xB0</status>
-            <midino>0x09</midino>
-            <options>
-                <soft-takeover />
-            </options>
-         </control>
          <control><!-- on -->
             <group>[Channel1]</group>
             <key>pfl</key>
@@ -1501,15 +1482,6 @@
                 <soft-takeover />
             </options>
          </control>
-         <control>
-            <group>[Channel2]</group>
-            <key>volume</key>
-            <status>0xB0</status>
-            <midino>0x0E</midino>
-            <options>
-                <soft-takeover />
-            </options>
-         </control>
          <control><!-- on -->
             <group>[Channel2]</group>
             <key>pfl</key>
@@ -1566,15 +1538,6 @@
                  <soft-takeover />
              </options>
          </control>
-         <control>
-             <group>[Channel3]</group>
-             <key>volume</key>
-             <status>0xB0</status>
-             <midino>0x04</midino>
-             <options>
-                 <soft-takeover />
-             </options>
-         </control>
          <control><!-- on -->
              <group>[Channel3]</group>
              <key>pfl</key>
@@ -1631,15 +1594,6 @@
                  <soft-takeover />
              </options>
          </control>
-         <control>
-             <group>[Channel4]</group>
-             <key>volume</key>
-             <status>0xB0</status>
-             <midino>0x13</midino>
-             <options>
-                 <soft-takeover />
-             </options>
-         </control>
          <control><!-- on -->
              <group>[Channel4]</group>
              <key>pfl</key>