incorporated suggestions from first review

2 files changed, 356 insertions, 396 deletions

diff --git a/res/controllers/Denon-MC7000-scripts.js b/res/controllers/Denon-MC7000-scripts.js
index 380f41d81b..5b79f57763 100644
--- a/res/controllers/Denon-MC7000-scripts.js
+++ b/res/controllers/Denon-MC7000-scripts.js
@@ -1,27 +1,29 @@
 /**
  * Denon DJ MC7000 DJ controller script for Mixxx 2.2.3
- * 
+ *
  * Started in Dec. 2019 by OsZ
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- * 
+ *
  * Before using the mapping please make sure your MC7000 controller works for
- * your operating system. For Windows you need driver software by Denon, Mac users 
- * should be lucky as it shall work out-of-the-box. Linux users need to compile 
- * their own Kernel with modified /sound/usb/clock.c see the "Denon MC7000 Mapping"
- * thread at https://www.mixxx.org/forums/viewtopic.php?f=7&t=13126
+ * your operating system. For Windows you need driver software by Denon, Mac users
+ * should be lucky as it shall work out-of-the-box. Linux users need to know that
+ * the MC7000 internal audio interface is not available out-of-the-box for
+ * older Linux Kernels. You should upgrade your Kernel to minimum versions
+ * LTS: 4.19.105 or 5.4.21, stable branch 5.5.5 or current 5.6 (2020-Feb-19).
+ * Newer Kernels will surely also provide native audio support for this controller.
 **/
 
 var MC7000 = {};
@@ -36,35 +38,36 @@ var MC7000 = {};
 MC7000.needleSearchPlay = false;
 
 // Pitch Fader ranges to cycle through with the "RANGE" buttons.
-var lowest = 4   ;// lowest value in % (default: 4)
-var low = 6      ;// next value in % (default: 6)
-var middle = 10  ;// next value in % (default: 10)
-var high = 16    ;// next value in % (default: 16)
-var highest = 24 ;// highest value in % (default: 24)
+var lowest = 4;   // lowest value in % (default: 4)
+var low = 6;      // next value in % (default: 6)
+var middle = 10;  // next value in % (default: 10)
+var high = 16;    // next value in % (default: 16)
+var highest = 24; // highest value in % (default: 24)
 
 // Platter Ring LED mode
 // Mode 0 = Single "off" LED chase (all others "on")
 // Mode 1 = Single "on" LED chase (all others "off")
 // use "SHIFT" + "DECK #" to toggle between both modes
-MC7000.modeSingleLED = 1    ;// default: 1
+MC7000.modeSingleLED = 1; // default: 1
 
 // Set Vinyl Mode on ("true") or off ("false") when MIXXX starts.
 // This sets the Jog Wheel touch detection / Vinyl Mode
 // and the Jog LEDs ("VINYL" on = spinny, "VINYL" off = track position).
-MC7000.VinylModeOn = true    ;// default: true
+MC7000.VinylModeOn = true; // default: true
 
 // Scratch algorithm parameters
 MC7000.scratchParams = {
-    recordSpeed: 33.3   ,// default: 33.3
-    alpha: (1.0/10)     ,// default: (1.0/10)
-    beta: (1.0/10)/32    // default: (1.0/10)/32
+    recordSpeed: 33.3, // default: 33.3
+    alpha: (1.0/10),   // default: (1.0/10)
+    beta: (1.0/10)/32  // default: (1.0/10)/32
 };
 
 // Sensitivity of the jog wheel (also depends on audio latency)
-// lower values make it less, higher value more sensible
 MC7000.jogParams = {
-    jogSensitivity: 30  ,// default: 30
-    maxJogValue: 3      ,// default: 3
+    // Lower values for less, higher values for more sensitive
+    jogSensitivity: 30, // default: 30
+    // this will limit the parameter of "jog" (keep between 0.5 and 3)
+    maxJogValue: 3      // default: 3
 };
 
 /*/////////////////////////////////
@@ -76,14 +79,14 @@ MC7000.jogParams = {
 
 // Resolution of the jog wheel, set so the spinny
 // Jog LED to match exactly the movement of the Jog Wheel
-// The physical resolution seams to be around 1100
+// The physical resolution seems to be around 1100
 MC7000.jogWheelTicksPerRevolution = 894;
 
 // Pitch faders up and down values (see above for user input)
 MC7000.posRateRanges = [lowest/100, low/100, middle/100, high/100, highest/100];
 MC7000.negRateRanges = [highest/100, high/100, middle/100, low/100, lowest/100];
 
-// must be "true" for Needle Search to be active 
+// must be "true" for Needle Search to be active
 MC7000.needleSearchTouched = [true, true, true, true];
 
 // initial value for VINYL mode per Deck (see above for user input)
@@ -106,76 +109,77 @@ MC7000.PADModePitch = [false, false, false, false];
 
 // PAD Mode Colors
 MC7000.padColor = {
-    'alloff': 0x01,         // typically not needed for PADs
-    'hotcueoff': 0x02,      // lightblue Hot Cue inactive
-    'hotcueon': 0x04,       // darkblue Hot Cue active
-    'sampleroff': 0x27,     // light pink Sampler standard colour
-    'samplerloaded': 0x38,  // dark pink Sampler loaded colour
-    'samplerplay': 0x09,    // green Sampler playing
-    'rollon': 0x10,         // BeatloopRoll active colour
-    'rolloff': 0x1B,        // BeatloopRoll off colour
-    'cueloopon': 0x0D,      // Cueloop colour for activated cue point
-    'cueloopoff': 0x1A      // Cueloop colour inactive
+    "alloff": 0x01,         // switch off completely
+    "hotcueoff": 0x02,      // lightblue Hot Cue inactive
+    "hotcueon": 0x04,       // darkblue Hot Cue active
+    "sampleroff": 0x27,     // light pink Sampler standard colour
+    "samplerloaded": 0x38,  // dark pink Sampler loaded colour
+    "samplerplay": 0x09,    // green Sampler playing
+    "rollon": 0x10,         // BeatloopRoll active colour
+    "rolloff": 0x1B,        // BeatloopRoll off colour
+    "cueloopon": 0x0D,      // Cueloop colour for activated cue point
+    "cueloopoff": 0x1A      // Cueloop colour inactive
 };
 
 /* DECK INITIALIZATION */
-MC7000.init = function () {
-	
+MC7000.init = function() {
+
     // Decks
     MC7000.leftDeck = new MC7000.Deck(1, 3);
     MC7000.rightDeck = new MC7000.Deck(2, 4);
-    
-    // set default Master Volume to give a little room for mixing
-    engine.setValue("[Master]", "gain", 0.85);
-    
+
+    // set default Master Volume to 85% to give a little head room for mixing
+    // engine.setValue("[Master]", "gain", 0.85);
+
     // VU meters
-    engine.connectControl("[Channel1]", "VuMeter", "MC7000.VuMeter");
-    engine.connectControl("[Channel2]", "VuMeter", "MC7000.VuMeter");
-    engine.connectControl("[Channel3]", "VuMeter", "MC7000.VuMeter");
-    engine.connectControl("[Channel4]", "VuMeter", "MC7000.VuMeter");
-        
-    // Platter Ring LED 
+    print(typeof MC7000.VuMeter);
+    engine.makeConnection("[Channel1]", "VuMeter", MC7000.VuMeter);
+    engine.makeConnection("[Channel2]", "VuMeter", MC7000.VuMeter);
+    engine.makeConnection("[Channel3]", "VuMeter", MC7000.VuMeter);
+    engine.makeConnection("[Channel4]", "VuMeter", MC7000.VuMeter);
+
+    // Platter Ring LED
     midi.sendShortMsg(0x90, 0x64, MC7000.modeSingleLED);
     midi.sendShortMsg(0x91, 0x64, MC7000.modeSingleLED);
     midi.sendShortMsg(0x92, 0x64, MC7000.modeSingleLED);
     midi.sendShortMsg(0x93, 0x64, MC7000.modeSingleLED);
-    engine.connectControl("[Channel1]", "playposition", "MC7000.JogLed");
-    engine.connectControl("[Channel2]", "playposition", "MC7000.JogLed");
-    engine.connectControl("[Channel3]", "playposition", "MC7000.JogLed");
-    engine.connectControl("[Channel4]", "playposition", "MC7000.JogLed");
-    	
-	// Vinyl mode LEDs
+    engine.makeConnection("[Channel1]", "playposition", MC7000.JogLed);
+    engine.makeConnection("[Channel2]", "playposition", MC7000.JogLed);
+    engine.makeConnection("[Channel3]", "playposition", MC7000.JogLed);
+    engine.makeConnection("[Channel4]", "playposition", MC7000.JogLed);
+
+    // Vinyl mode LEDs
     midi.sendShortMsg(0x90, 0x07, MC7000.isVinylMode ? 0x7F: 0x01);
     midi.sendShortMsg(0x91, 0x07, MC7000.isVinylMode ? 0x7F: 0x01);
     midi.sendShortMsg(0x92, 0x07, MC7000.isVinylMode ? 0x7F: 0x01);
     midi.sendShortMsg(0x93, 0x07, MC7000.isVinylMode ? 0x7F: 0x01);
-    
+
     // PAD Mode LEDs
     for (var i = 1; i <= 8; i++) {
-        engine.connectControl("[Channel1]", "hotcue_"+i+"_enabled", "MC7000.HotCueLED");
-        engine.connectControl("[Channel2]", "hotcue_"+i+"_enabled", "MC7000.HotCueLED");
-        engine.connectControl("[Channel3]", "hotcue_"+i+"_enabled", "MC7000.HotCueLED");
-        engine.connectControl("[Channel4]", "hotcue_"+i+"_enabled", "MC7000.HotCueLED");
-    };
-    
+        engine.makeConnection("[Channel1]", "hotcue_"+i+"_enabled", MC7000.HotCueLED);
+        engine.makeConnection("[Channel2]", "hotcue_"+i+"_enabled", MC7000.HotCueLED);
+        engine.makeConnection("[Channel3]", "hotcue_"+i+"_enabled", MC7000.HotCueLED);
+        engine.makeConnection("[Channel4]", "hotcue_"+i+"_enabled", MC7000.HotCueLED);
+    }
+
     // Sampler Volume Control
-    MC7000.samplerLevel = function (channel, control, value, status, group) {
+    MC7000.samplerLevel = function(channel, control, value) {
         // check if the Sampler Volume is at Zero and if so hide the sampler bank
         if (value > 0x00) {
             engine.setValue("[Samplers]", "show_samplers", true);
         } else {
             engine.setValue("[Samplers]", "show_samplers", false);
-        };
-   	    // get the Sampler Rows opened with its details
-    	engine.setValue("[SamplerRow1]", "expanded", true);
-    	engine.setValue("[SamplerRow2]", "expanded", true);
-    	
-    	//control up to 16 sampler volumes with the one knob on the mixer
-    	for (var i = 1; i <= 16; i++) {
+        }
+        // get the Sampler Rows opened with its details
+        engine.setValue("[SamplerRow1]", "expanded", true);
+        engine.setValue("[SamplerRow2]", "expanded", true);
+
+        //control up to 16 sampler volumes with the one knob on the mixer
+        for (var i = 1; i <= 16; i++) {
             engine.setValue("[Sampler"+i+"]", "pregain", script.absoluteNonLin(value, 0, 1.0, 4.0));
-        };
+        }
     };
-    
+
     // The SysEx message to send to the controller to force the midi controller
     // to send the status of every item on the control surface.
     var ControllerStatusSysex = [0xF0, 0x00, 0x20, 0x7F, 0x03, 0x01, 0xF7];
@@ -187,16 +191,16 @@ MC7000.init = function () {
 };
 
 /* CONSTRUCTOR FOR DECK OBJECT */
-MC7000.Deck = function(channel) {
-  
+MC7000.Deck = function() {
+
     // PAD Mode Hot Cue
     MC7000.padModeCue = function(channel, control, value, status, group) {
         var deckNumber = script.deckFromGroup(group);
         if (value === 0x00) return;     // don't respond to note off messages
         if (value === 0x7F) {
-        	// set HotCue Mode true
-        	MC7000.PADModeCue[deckNumber] = true;
-        	MC7000.PADModeCueLoop[deckNumber] = false;
+            // set HotCue Mode true
+            MC7000.PADModeCue[deckNumber] = true;
+            MC7000.PADModeCueLoop[deckNumber] = false;
             MC7000.PADModeFlip[deckNumber] = false;
             MC7000.PADModeRoll[deckNumber] = false;
             MC7000.PADModeSavedLoop[deckNumber] = false;
@@ -205,23 +209,23 @@ MC7000.Deck = function(channel) {
             MC7000.PADModeSampler[deckNumber] = false;
             MC7000.PADModeVelSamp[deckNumber] = false;
             MC7000.PADModePitch[deckNumber] = false;
-        };
+        }
         // change PAD color when switching to Hot Cue Mode
         for (var i = 1; i <= 8; i++) {
             if (engine.getValue(group, "hotcue_"+i+"_enabled", true)) {
                 midi.sendShortMsg(0x94 + deckNumber -1, 0x14 + i -1, MC7000.padColor.hotcueon);
             } else {
                 midi.sendShortMsg(0x94 + deckNumber -1, 0x14 + i -1, MC7000.padColor.hotcueoff);
-            };
-        };
+            }
+        }
     };
     // PAD Mode Cue Loop
     MC7000.padModeCueLoop = function(channel, control, value, status, group) {
         var deckNumber = script.deckFromGroup(group);
         if (value === 0x00) return;     // don't respond to note off messages
         if (value === 0x7F) {
-        	MC7000.PADModeCue[deckNumber] = false;
-        	MC7000.PADModeCueLoop[deckNumber] = true;
+            MC7000.PADModeCue[deckNumber] = false;
+            MC7000.PADModeCueLoop[deckNumber] = true;
             MC7000.PADModeFlip[deckNumber] = false;
             MC7000.PADModeRoll[deckNumber] = false;
             MC7000.PADModeSavedLoop[deckNumber] = false;
@@ -230,18 +234,18 @@ MC7000.Deck = function(channel) {
             MC7000.PADModeSampler[deckNumber] = false;
             MC7000.PADModeVelSamp[deckNumber] = false;
             MC7000.PADModePitch[deckNumber] = false;
-        };
+        }
         for (var i = 1; i <= 8; i++) {
             midi.sendShortMsg(0x94 + deckNumber -1, 0x14 + i -1, MC7000.padColor.alloff);
-        };
+        }
     };
     // PAD Mode Flip
     MC7000.padModeFlip = function(channel, control, value, status, group) {
         var deckNumber = script.deckFromGroup(group);
         if (value === 0x00) return;     // don't respond to note off messages
         if (value === 0x7F) {
-        	MC7000.PADModeCue[deckNumber] = false;
-        	MC7000.PADModeCueLoop[deckNumber] = false;
+            MC7000.PADModeCue[deckNumber] = false;
+            MC7000.PADModeCueLoop[deckNumber] = false;
             MC7000.PADModeFlip[deckNumber] = true;
             MC7000.PADModeRoll[deckNumber] = false;
             MC7000.PADModeSavedLoop[deckNumber] = false;
@@ -250,18 +254,18 @@ MC7000.Deck = function(channel) {
             MC7000.PADModeSampler[deckNumber] = false;
             MC7000.PADModeVelSamp[deckNumber] = false;
             MC7000.PADModePitch[deckNumber] = false;
-        };
+        }
         for (var i = 1; i <= 8; i++) {
             midi.sendShortMsg(0x94 + deckNumber -1, 0x14 + i -1, MC7000.padColor.alloff);
-        };
+        }
     };
     // PAD Mode Roll
     MC7000.padModeRoll = function(channel, control, value, status, group) {
         var deckNumber = script.deckFromGroup(group);
         if (value === 0x00) return;     // don't respond to note off messages
         if (value === 0x7F) {
-        	MC7000.PADModeCue[deckNumber] = false;
-        	MC7000.PADModeCueLoop[deckNumber] = false;
+            MC7000.PADModeCue[deckNumber] = false;
+            MC7000.PADModeCueLoop[deckNumber] = false;
             MC7000.PADModeFlip[deckNumber] = false;
             MC7000.PADModeRoll[deckNumber] = true;
             MC7000.PADModeSavedLoop[deckNumber] = false;
@@ -270,18 +274,18 @@ MC7000.Deck = function(channel) {
             MC7000.PADModeSampler[deckNumber] = false;
             MC7000.PADModeVelSamp[deckNumber] = false;
             MC7000.PADModePitch[deckNumber] = false;
-        };
+        }
         for (var i = 1; i <= 8; i++) {
             midi.sendShortMsg(0x94 + deckNumber -1, 0x14 + i -1, MC7000.padColor.rolloff);
-        };
+        }
     };
     // PAD Mode Saved Loop
     MC7000.padModeSavedLoop = function(channel, control, value, status, group) {
         var deckNumber = script.deckFromGroup(group);
         if (value === 0x00) return;     // don't respond to note off messages
         if (value === 0x7F) {
-        	MC7000.PADModeCue[deckNumber] = false;
-        	MC7000.PADModeCueLoop[deckNumber] = false;
+            MC7000.PADModeCue[deckNumber] = false;
+            MC7000.PADModeCueLoop[deckNumber] = false;
             MC7000.PADModeFlip[deckNumber] = false;
             MC7000.PADModeRoll[deckNumber] = false;
             MC7000.PADModeSavedLoop[deckNumber] = true;
@@ -290,18 +294,18 @@ MC7000.Deck = function(channel) {
             MC7000.PADModeSampler[deckNumber] = false;
             MC7000.PADModeVelSamp[deckNumber] = false;
             MC7000.PADModePitch[deckNumber] = false;
-        };
+        }
         for (var i = 1; i <= 8; i++) {
             midi.sendShortMsg(0x94 + deckNumber -1, 0x14 + i -1, MC7000.padColor.alloff);
-        };
+        }
     };
     // PAD Mode Slicer
     MC7000.padModeSlicer = function(channel, control, value, status, group) {
         var deckNumber = script.deckFromGroup(group);
         if (value === 0x00) return;     // don't respond to note off messages
         if (value === 0x7F) {
-        	MC7000.PADModeCue[deckNumber] = false;
-        	MC7000.PADModeCueLoop[deckNumber] = false;
+            MC7000.PADModeCue[deckNumber] = false;
+            MC7000.PADModeCueLoop[deckNumber] = false;
             MC7000.PADModeFlip[deckNumber] = false;
             MC7000.PADModeRoll[deckNumber] = false;
             MC7000.PADModeSavedLoop[deckNumber] = false;
@@ -310,18 +314,18 @@ MC7000.Deck = function(channel) {
             MC7000.PADModeSampler[deckNumber] = false;
             MC7000.PADModeVelSamp[deckNumber] = false;
             MC7000.PADModePitch[deckNumber] = false;
-        };
+        }
         for (var i = 1; i <= 8; i++) {
             midi.sendShortMsg(0x94 + deckNumber -1, 0x14 + i -1, MC7000.padColor.alloff);
-        };
+        }
     };
     // PAD Mode Slicer Loop
     MC7000.padModeSlicerLoop = function(channel, control, value, status, group) {
         var deckNumber = script.deckFromGroup(group);
         if (value === 0x00) return;     // don't respond to note off messages
         if (value === 0x7F) {
-        	MC7000.PADModeCue[deckNumber] = false;
-        	MC7000.PADModeCueLoop[deckNumber] = false;
+            MC7000.PADModeCue[deckNumber] = false;
+            MC7000.PADModeCueLoop[deckNumber] = false;
             MC7000.PADModeFlip[deckNumber] = false;
             MC7000.PADModeRoll[deckNumber] = false;
             MC7000.PADModeSavedLoop[deckNumber] = false;
@@ -330,18 +334,18 @@ MC7000.Deck = function(channel) {
             MC7000.PADModeSampler[deckNumber] = false;
             MC7000.PADModeVelSamp[deckNumber] = false;
             MC7000.PADModePitch[deckNumber] = false;
-        };
+        }
         for (var i = 1; i <= 8; i++) {
             midi.sendShortMsg(0x94 + deckNumber -1, 0x14 + i -1, MC7000.padColor.alloff);
-        };
+        }
     };
     // PAD Mode Sampler
     MC7000.padModeSampler = function(channel, control, value, status, group) {
         var deckNumber = script.deckFromGroup(group);
         if (value === 0x00) return;     // don't respond to note off messages
         if (value === 0x7F) {
-        	MC7000.PADModeCue[deckNumber] = false;
-        	MC7000.PADModeCueLoop[deckNumber] = false;
+            MC7000.PADModeCue[deckNumber] = false;
+            MC7000.PADModeCueLoop[deckNumber] = false;
             MC7000.PADModeFlip[deckNumber] = false;
             MC7000.PADModeRoll[deckNumber] = false;
             MC7000.PADModeSavedLoop[deckNumber] = false;
@@ -350,28 +354,26 @@ MC7000.Deck = function(channel) {
             MC7000.PADModeSampler[deckNumber] = true;
             MC7000.PADModeVelSamp[deckNumber] = false;
             MC7000.PADModePitch[deckNumber] = false;
-        };
+        }
         // change PAD color when switching to Sampler Mode
         for (var i = 1; i <= 8; i++) {
-        	if(engine.getValue("[Sampler"+i+"]", "play")) {
-        	    midi.sendShortMsg(0x94 + deckNumber - 1, 0x14 + i -1, MC7000.padColor.samplerplay);
-        	} 
-        	else if(engine.getValue("[Sampler"+i+"]", "track_loaded") === 0 ) {
-        		    midi.sendShortMsg(0x94 + deckNumber - 1, 0x14 + i -1, MC7000.padColor.sampleroff);
-            } 
-            else if(engine.getValue("[Sampler"+i+"]", "track_loaded") === 1 
-        		    && engine.getValue("[Sampler"+i+"]", "play") === 0) {
-        		        midi.sendShortMsg(0x94 + deckNumber - 1, 0x14 + i -1, MC7000.padColor.samplerloaded);
-            };
-        };
+            if (engine.getValue("[Sampler"+i+"]", "play")) {
+                midi.sendShortMsg(0x94 + deckNumber - 1, 0x14 + i -1, MC7000.padColor.samplerplay);
+            } else if (engine.getValue("[Sampler"+i+"]", "track_loaded") === 0) {
+                midi.sendShortMsg(0x94 + deckNumber - 1, 0x14 + i -1, MC7000.padColor.sampleroff);
+            } else if (engine.getValue("[Sampler"+i+"]", "track_loaded") === 1
+                    && engine.getValue("[Sampler"+i+"]", "play") === 0) {
+                midi.sendShortMsg(0x94 + deckNumber - 1, 0x14 + i -1, MC7000.padColor.samplerloaded);
+            }
+        }
     };
     // PAD Mode Velocity Sampler
     MC7000.padModeVelSamp = function(channel, control, value, status, group) {
         var deckNumber = script.deckFromGroup(group);
         if (value === 0x00) return;     // don't respond to note off messages
         if (value === 0x7F) {
-        	MC7000.PADModeCue[deckNumber] = false;
-        	MC7000.PADModeCueLoop[deckNumber] = false;
+            MC7000.PADModeCue[deckNumber] = false;
+            MC7000.PADModeCueLoop[deckNumber] = false;
             MC7000.PADModeFlip[deckNumber] = false;
             MC7000.PADModeRoll[deckNumber] = false;
             MC7000.PADModeSavedLoop[deckNumber] = false;
@@ -380,18 +382,18 @@ MC7000.Deck = function(channel) {
             MC7000.PADModeSampler[deckNumber] = false;
             MC7000.PADModeVelSamp[deckNumber] = true;
             MC7000.PADModePitch[deckNumber] = false;
-        };
+        }
         for (var i = 1; i <= 8; i++) {
             midi.sendShortMsg(0x94 + deckNumber -1, 0x14 + i -1, MC7000.padColor.alloff);
-        };
+        }
     };
     // PAD Mode Slicer
     MC7000.padModePitch = function(channel, control, value, status, group) {
         var deckNumber = script.deckFromGroup(group);
         if (value === 0x00) return;     // don't respond to note off messages
         if (value === 0x7F) {
-        	MC7000.PADModeCue[deckNumber] = false;
-        	MC7000.PADModeCueLoop[deckNumber] = false;
+            MC7000.PADModeCue[deckNumber] = false;
+            MC7000.PADModeCueLoop[deckNumber] = false;
             MC7000.PADModeFlip[deckNumber] = false;
             MC7000.PADModeRoll[deckNumber] = false;
             MC7000.PADModeSavedLoop[deckNumber] = false;
@@ -400,309 +402,274 @@ MC7000.Deck = function(channel) {
             MC7000.PADModeSampler[deckNumber] = false;
             MC7000.PADModeVelSamp[deckNumber] = false;
             MC7000.PADModePitch[deckNumber] = true;
-        };
+        }
         for (var i = 1; i <= 8; i++) {
             midi.sendShortMsg(0x94 + deckNumber -1, 0x14 + i -1, MC7000.padColor.alloff);
-        };
+        }
     };
-	
-	// PAD buttons
-	MC7000.PadButtons = function (channel, control, value, status, group) {
+
+    // PAD buttons
+    MC7000.PadButtons = function(channel, control, value, status, group) {
         var deckNumber = script.deckFromGroup(group);
-        
-        // activate and clear Hot Cues    
+
+        // activate and clear Hot Cues
         if (MC7000.PADModeCue[deckNumber] && engine.getValue(group, "track_loaded") === 1) {
             for (var i = 1; i <= 8; i++) {
                 if (control === 0x14 + i -1 && value >= 0x01) {
-                	engine.setValue(group, "hotcue_"+i+"_activate", true);
+                    engine.setValue(group, "hotcue_"+i+"_activate", true);
                 } else {
-                	engine.setValue(group, "hotcue_"+i+"_activate", false);
-                };
+                    engine.setValue(group, "hotcue_"+i+"_activate", false);
+                }
                 if (control === 0x1C + i -1 && value >= 0x01) {
-                	engine.setValue(group, "hotcue_"+i+"_clear", true);
-                	midi.sendShortMsg(0x94 + deckNumber -1, 0x1C + i -1, MC7000.padColor.hotcueoff);
-                };
-            };
-        }
-        // Cue Loop
-        else if (MC7000.PADModeFlip[deckNumber]) {
-        	return;
-        }
-        // Flip
-        else if (MC7000.PADModeFlip[deckNumber]) {
-        	return;
-        }
-        // Roll
-        else if (MC7000.PADModeRoll[deckNumber]) {
+                    engine.setValue(group, "hotcue_"+i+"_clear", true);
+                    midi.sendShortMsg(0x94 + deckNumber -1, 0x1C + i -1, MC7000.padColor.hotcueoff);
+                }
+            }
+        } else if (MC7000.PADModeFlip[deckNumber]) {
+            return;
+        } else if (MC7000.PADModeFlip[deckNumber]) {
+            return;
+        } else if (MC7000.PADModeRoll[deckNumber]) {
             if (control === 0x14 && value >= 0x01) {
                 engine.setValue(group, "beatlooproll_0.0625_activate", true);
                 midi.sendShortMsg(0x94 + deckNumber -1, 0x14, MC7000.padColor.rollon);
-            }
-            else if (control === 0x14 && value >= 0x00) {
+            } else if (control === 0x14 && value >= 0x00) {
                 engine.setValue(group, "beatlooproll_0.0625_activate", false);
                 midi.sendShortMsg(0x94 + deckNumber -1, 0x14, MC7000.padColor.rolloff);
-            }
-            else if (control === 0x15 && value >= 0x01) {
+            } else if (control === 0x15 && value >= 0x01) {
                 engine.setValue(group, "beatlooproll_0.125_activate", true);
                 midi.sendShortMsg(0x94 + deckNumber -1, 0x15, MC7000.padColor.rollon);
-            }
-            else if (control === 0x15 && value >= 0x00) {
+            } else if (control === 0x15 && value >= 0x00) {
                 engine.setValue(group, "beatlooproll_0.125_activate", false);
                 midi.sendShortMsg(0x94 + deckNumber -1, 0x15, MC7000.padColor.rolloff);
-            }
-            else if (control === 0x16 && value >= 0x01) {
-                    engine.setValue(group, "beatlooproll_0.25_activate", true);
-                    midi.sendShortMsg(0x94 + deckNumber -1, 0x16, MC7000.padColor.rollon);
-            }
-            else if (control === 0x16 && value >= 0x00) {
-                    engine.setValue(group, "beatlooproll_0.25_activate", false);
-                    midi.sendShortMsg(0x94 + deckNumber -1, 0x16, MC7000.padColor.rolloff);
-            }
-            else if (control === 0x17 && value >= 0x01) {
-                    engine.setValue(group, "beatlooproll_0.5_activate", true);
-                    midi.sendShortMsg(0x94 + deckNumber -1, 0x17, MC7000.padColor.rollon);
-            }
-            else if (control === 0x17 && value >= 0x00) {
-                    engine.setValue(group, "beatlooproll_0.5_activate", false);
-                    midi.sendShortMsg(0x94 + deckNumber -1, 0x17, MC7000.padColor.rolloff);
-            }
-            else if (control === 0x18 && value >= 0x01) {
+            } else if (control === 0x16 && value >= 0x01) {
+                engine.setValue(group, "beatlooproll_0.25_activate", true);
+                midi.sendShortMsg(0x94 + deckNumber -1, 0x16, MC7000.padColor.rollon);
+            } else if (control === 0x16 && value >= 0x00) {
+                engine.setValue(group, "beatlooproll_0.25_activate", false);
+                midi.sendShortMsg(0x94 + deckNumber -1, 0x16, MC7000.padColor.rolloff);
+            } else if (control === 0x17 && value >= 0x01) {
+                engine.setValue(group, "beatlooproll_0.5_activate", true);
+                midi.sendShortMsg(0x94 + deckNumber -1, 0x17, MC7000.padColor.rollon);
+            } else if (control === 0x17 && value >= 0x00) {
+                engine.setValue(group, "beatlooproll_0.5_activate", false);
+                midi.sendShortMsg(0x94 + deckNumber -1, 0x17, MC7000.padColor.rolloff);
+            } else if (control === 0x18 && value >= 0x01) {
                 engine.setValue(group, "beatlooproll_1_activate", true);
                 midi.sendShortMsg(0x94 + deckNumber -1, 0x18, MC7000.padColor.rollon);
-            }
-            else if (control === 0x18 && value >= 0x00) {
+            } else if (control === 0x18 && value >= 0x00) {
                 engine.setValue(group, "beatlooproll_1_activate", false);
                 midi.sendShortMsg(0x94 + deckNumber -1, 0x18, MC7000.padColor.rolloff);
-            }
-            else if (control === 0x19 && value >= 0x01) {
+            } else if (control === 0x19 && value >= 0x01) {
                 engine.setValue(group, "beatlooproll_2_activate", true);
                 midi.sendShortMsg(0x94 + deckNumber -1, 0x19, MC7000.padColor.rollon);
-            }
-            else if (control === 0x19 && value >= 0x00) {
+            } else if (control === 0x19 && value >= 0x00) {
                 engine.setValue(group, "beatlooproll_2_activate", false);
                 midi.sendShortMsg(0x94 + deckNumber -1, 0x19, MC7000.padColor.rolloff);
-            }
-            else if (control === 0x1A && value >= 0x01) {
+            } else if (control === 0x1A && value >= 0x01) {
                 engine.setValue(group, "beatlooproll_4_activate", true);
                 midi.sendShortMsg(0x94 + deckNumber -1, 0x1A, MC7000.padColor.rollon);
-            }
-            else if (control === 0x1A && value >= 0x00) {
+            } else if (control === 0x1A && value >= 0x00) {
                 engine.setValue(group, "beatlooproll_4_activate", false);
                 midi.sendShortMsg(0x94 + deckNumber -1, 0x1A, MC7000.padColor.rolloff);
-            }
-            else if (control === 0x1B && value >= 0x01) {
+            } else if (control === 0x1B && value >= 0x01) {
                 engine.setValue(group, "beatlooproll_8_activate", true);
                 midi.sendShortMsg(0x94 + deckNumber -1, 0x1B, MC7000.padColor.rollon);
-            }
-            else if (control === 0x1B && value >= 0x00) {
+            } else if (control === 0x1B && value >= 0x00) {
                 engine.setValue(group, "beatlooproll_8_activate", false);
                 midi.sendShortMsg(0x94 + deckNumber -1, 0x1B, MC7000.padColor.rolloff);
             }
-        }
-        // Saved Loop
-        else if (MC7000.PADModeSavedLoop[deckNumber]) {
-        	return;
-        }
-        // Slicer
-        else if (MC7000.PADModeSlicer[deckNumber]) {
-        	return;
-        }
-        // Slicer Loop
-        else if (MC7000.PADModeSlicerLoop[deckNumber]) {
-        	return;
-        }
-        // Sampler 1 - 8
-        else if (MC7000.PADModeSampler[deckNumber]) {
-        	for (var i = 1; i <= 8; i++) {
+        } else if (MC7000.PADModeSavedLoop[deckNumber]) {
+            return;
+        } else if (MC7000.PADModeSlicer[deckNumber]) {
+            return;
+        } else if (MC7000.PADModeSlicerLoop[deckNumber]) {
+            return;
+        } else if (MC7000.PADModeSampler[deckNumber]) {
+            for (i = 1; i <= 8; i++) {
                 if (control === 0x14 + i -1 && value >= 0x01) {
                     // 1st - check if track is loaded
-                	if (engine.getValue("[Sampler"+i+"]", "track_loaded") === 0) {
-                  		engine.setValue("[Sampler"+i+"]", "LoadSelectedTrack", 1);
-                  		midi.sendShortMsg(0x94 + deckNumber - 1, 0x14 + i -1, MC7000.padColor.samplerloaded);
-                	}
-                	// 2nd - if track is playing then stop it
-                	else if(engine.getValue("[Sampler"+i+"]", "play") === 1) {
-                    	engine.setValue("[Sampler"+i+"]", "start_stop", 1);
-		                midi.sendShortMsg(0x94 + deckNumber - 1, 0x14 + i -1, MC7000.padColor.samplerloaded);
-		            }
-		            // 3rd - if track is loaded but not playing
-				    else if (engine.getValue("[Sampler"+i+"]", "track_loaded") === 1) {
-				    	
+                    if (engine.getValue("[Sampler"+i+"]", "track_loaded") === 0) {
+                        engine.setValue("[Sampler"+i+"]", "LoadSelectedTrack", 1);
+                        midi.sendShortMsg(0x94 + deckNumber - 1, 0x14 + i -1, MC7000.padColor.samplerloaded);
+                    }
+                    // 2nd - if track is playing then stop it
+                    else if (engine.getValue("[Sampler"+i+"]", "play") === 1) {
+                        engine.setValue("[Sampler"+i+"]", "start_stop", 1);
+                        midi.sendShortMsg(0x94 + deckNumber - 1, 0x14 + i -1, MC7000.padColor.samplerloaded);
+                    }
+                    // 3rd - if track is loaded but not playing
+                    else if (engine.getValue("[Sampler"+i+"]", "track_loaded") === 1) {
+
                         engine.setValue("[Sampler"+i+"]", "start_play", 1);
                         midi.sendShortMsg(0x94 + deckNumber - 1, 0x14 + i -1, MC7000.padColor.samplerplay);
-                    //    var samplerlength = engine.getValue("[Sampler"+i+"]", "duration");
+                        //    var samplerlength = engine.getValue("[Sampler"+i+"]", "duration");
 
                     }
+                } else if (control === 0x1C + i -1 && value >= 0x01) {
+                    engine.setValue("[Sampler"+i+"]", "play", 0);
+                    engine.setValue("[Sampler"+i+"]", "eject", 1);
+                    midi.sendShortMsg(0x94 + deckNumber - 1, 0x1C + i -1, MC7000.padColor.sampleroff);
+                    engine.setValue("[Sampler"+i+"]", "eject", 0);
                 }
-                else if (control === 0x1C + i -1 && value >= 0x01) {
-                	engine.setValue("[Sampler"+i+"]", "play", 0);
-                	engine.setValue("[Sampler"+i+"]", "eject", 1);
-                	midi.sendShortMsg(0x94 + deckNumber - 1, 0x1C + i -1, MC7000.padColor.sampleroff);
-                	engine.setValue("[Sampler"+i+"]", "eject", 0);
-                };
-            };
+            }
             // TODO: check for the actual status of LEDs again on other decks
-        }
-        // Velocity Sampler
-        else if (MC7000.PADModeVelSamp[deckNumber]) {
-        	return;
-        }
-        // Pitch
-        else if (MC7000.PADModePitch[deckNumber]) {
-        	return;
+        } else if (MC7000.PADModeVelSamp[deckNumber]) {
+            return;
+        } else if (MC7000.PADModePitch[deckNumber]) {
+            return;
         }
     };
-	
+
     // Toggle Vinyl Mode
     MC7000.vinylModeToggle = function(channel, control, value, status, group) {
         if (value === 0x00) return;     // don't respond to note off messages
-        
+
         if (value === 0x7F) {
             var deckNumber = script.deckFromGroup(group);
             MC7000.isVinylMode[deckNumber] = !MC7000.isVinylMode[deckNumber];
             midi.sendShortMsg(0x90 + channel, 0x07, MC7000.isVinylMode[deckNumber] ? 0x7F: 0x01);
-        };
-    }; 
-    
-	// The button that enables/disables scratching
+        }
+    };
+
+    // The button that enables/disables scratching
     MC7000.wheelTouch = function(channel, control, value, status, group) {
-    	var deckNumber = script.deckFromGroup(group);
-    	if (MC7000.isVinylMode[deckNumber]) {
-    	    if (value === 0x7F) {
-  	       	    engine.scratchEnable(deckNumber, MC7000.jogWheelTicksPerRevolution, MC7000.scratchParams.recordSpeed, MC7000.scratchParams.alpha, MC7000.scratchParams.beta);
-  	        } else {
-  	  	        engine.scratchDisable(deckNumber);
-  	        }
-  	    }
+        var deckNumber = script.deckFromGroup(group);
+        if (MC7000.isVinylMode[deckNumber]) {
+            if (value === 0x7F) {
+                engine.scratchEnable(deckNumber, MC7000.jogWheelTicksPerRevolution, MC7000.scratchParams.recordSpeed, MC7000.scratchParams.alpha, MC7000.scratchParams.beta);
+            } else {
+                engine.scratchDisable(deckNumber);
+            }
+        }
     };
-     
+
     // The wheel that actually controls the scratching
     MC7000.wheelTurn = function(channel, control, value, status, group) {
-    
-    	// A: For a control that centers on 0:
-    	var numTicks = (value < 0x64) ? value: (value - 128);
+
+        // A: For a control that centers on 0:
+        var numTicks = (value < 0x64) ? value: (value - 128);
         var deckNumber = script.deckFromGroup(group);
         if (engine.isScratching(deckNumber)) {
-        	// Scratch!
+            // Scratch!
             engine.scratchTick(deckNumber, numTicks);
         } else {
-        	// Pitch bend
+            // Pitch bend
             var jogDelta = numTicks/MC7000.jogWheelTicksPerRevolution*MC7000.jogParams.jogSensitivity;
             var jogAbsolute = jogDelta + engine.getValue(group, "jog");
-            engine.setValue(group, 'jog', Math.max(-MC7000.jogParams.maxJogValue, Math.min(MC7000.jogParams.maxJogValue, jogAbsolute)));
+            engine.setValue(group, "jog", Math.max(-MC7000.jogParams.maxJogValue, Math.min(MC7000.jogParams.maxJogValue, jogAbsolute)));
         }
     };
-    
+
     // Needle Search Touch detection
     MC7000.needleSearchTouch = function(channel, control, value, status, group) {
         var deckNumber = script.deckFromGroup(group);
         if (engine.getValue(group, "play")) {
-            MC7000.needleSearchTouched[deckNumber] = MC7000.needleSearchPlay && (value ? true : false);
+            MC7000.needleSearchTouched[deckNumber] = MC7000.needleSearchPlay && (!!value);
         } else {
-            MC7000.needleSearchTouched[deckNumber] = value ? true : false;
+            MC7000.needleSearchTouched[deckNumber] = !!value;
         }
     };
-            
+
     // Needle Search Touch while "SHIFT" button is pressed
     MC7000.needleSearchTouchShift = function(channel, control, value, status, group) {
         var deckNumber = script.deckFromGroup(group);
-        MC7000.needleSearchTouched[deckNumber] = value ? true : false;
+        MC7000.needleSearchTouched[deckNumber] = !!value;
     };
 
-    // Needle Search Position detection (LSB)
-    MC7000.needleSearchLSB = function(channel, control, value, status, group) {
-    	MC7000.needleDropLSB = value; // just defining rough position
+    // Needle Search Position detection (MSB)
+    MC7000.needleSearchMSB = function(channel, control, value) {
+        MC7000.needleDropMSB = value; // just defining rough position
     };
-    
-    // Needle Search Position detection (LSB + MSB)
+
+    // Needle Search Position detection (MSB + LSB)
     MC7000.needleSearchStripPosition = function(channel, control, value, status, group) {
         var deckNumber = script.deckFromGroup(group);
         if (MC7000.needleSearchTouched[deckNumber]) {
-            var fullValue = (MC7000.needleDropLSB << 7) + value; // move LSB 7 binary gigits to the left and add MSB
+            var fullValue = (MC7000.needleDropMSB << 7) + value; // move MSB 7 binary gigits to the left and add LSB
             var position = (fullValue / 0x3FFF); // devide by all possible positions to get relative between 0 - 1
             engine.setParameter(group, "playposition", position);
         }
     };
-    
-