DN-MC6000MK2: Looping

- Loops: Manual, beat and beatroll
- Censor: Use reverseroll instead of reverse
- Scratching: Don't modify keylock mode

1 files changed, 173 insertions, 101 deletions

diff --git a/res/controllers/Denon-MC6000MK2.midi.xml b/res/controllers/Denon-MC6000MK2.midi.xml
index b6011d6406..371cb30c6a 100644
--- a/res/controllers/Denon-MC6000MK2.midi.xml
+++ b/res/controllers/Denon-MC6000MK2.midi.xml
@@ -523,6 +523,15 @@
 			<control>
 				<group>[Channel1]</group>
 				<midino>0x69</midino>
+				<status>0x80</status>
+				<key>DenonMC6000MK2.onLoopCutMinusButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<group>[Channel1]</group>
+				<midino>0x69</midino>
 				<status>0x90</status>
 				<key>DenonMC6000MK2.onLoopCutMinusButton</key>
 				<options>
@@ -532,6 +541,15 @@
 			<control>
 				<group>[Channel1]</group>
 				<midino>0x6A</midino>
+				<status>0x80</status>
+				<key>DenonMC6000MK2.onLoopCutPlusButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<group>[Channel1]</group>
+				<midino>0x6A</midino>
 				<status>0x90</status>
 				<key>DenonMC6000MK2.onLoopCutPlusButton</key>
 				<options>
@@ -928,6 +946,15 @@
 			<control>
 				<group>[Channel2]</group>
 				<midino>0x69</midino>
+				<status>0x82</status>
+				<key>DenonMC6000MK2.onLoopCutMinusButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<group>[Channel2]</group>
+				<midino>0x69</midino>
 				<status>0x92</status>
 				<key>DenonMC6000MK2.onLoopCutMinusButton</key>
 				<options>
@@ -937,6 +964,15 @@
 			<control>
 				<group>[Channel2]</group>
 				<midino>0x6A</midino>
+				<status>0x82</status>
+				<key>DenonMC6000MK2.onLoopCutPlusButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<group>[Channel2]</group>
+				<midino>0x6A</midino>
 				<status>0x92</status>
 				<key>DenonMC6000MK2.onLoopCutPlusButton</key>
 				<options>
@@ -1333,6 +1369,15 @@
 			<control>
 				<group>[Channel3]</group>
 				<midino>0x69</midino>
+				<status>0x81</status>
+				<key>DenonMC6000MK2.onLoopCutMinusButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<group>[Channel3]</group>
+				<midino>0x69</midino>
 				<status>0x91</status>
 				<key>DenonMC6000MK2.onLoopCutMinusButton</key>
 				<options>
@@ -1342,6 +1387,15 @@
 			<control>
 				<group>[Channel3]</group>
 				<midino>0x6A</midino>
+				<status>0x81</status>
+				<key>DenonMC6000MK2.onLoopCutPlusButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<group>[Channel3]</group>
+				<midino>0x6A</midino>
 				<status>0x91</status>
 				<key>DenonMC6000MK2.onLoopCutPlusButton</key>
 				<options>
@@ -1738,6 +1792,15 @@
 			<control>
 				<group>[Channel4]</group>
 				<midino>0x69</midino>
+				<status>0x83</status>
+				<key>DenonMC6000MK2.onLoopCutMinusButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<group>[Channel4]</group>
+				<midino>0x69</midino>
 				<status>0x93</status>
 				<key>DenonMC6000MK2.onLoopCutMinusButton</key>
 				<options>
@@ -1747,6 +1810,15 @@
 			<control>
 				<group>[Channel4]</group>
 				<midino>0x6A</midino>
+				<status>0x83</status>
+				<key>DenonMC6000MK2.onLoopCutPlusButton</key>
+				<options>
+					<script-binding/>
+				</options>
+			</control>
+			<control>
+				<group>[Channel4]</group>
+				<midino>0x6A</midino>
 				<status>0x93</status>
 				<key>DenonMC6000MK2.onLoopCutPlusButton</key>
 				<options>
@@ -1800,7 +1872,7 @@
 			</control>
 		</controls>
 		<outputs>
-			<!-- [Channel1] VU meter -->
+			<!-- VU meter - 1st green -->
 			<output>
 				<group>[Channel1]</group>
 				<key>VuMeter</key>
@@ -1811,78 +1883,78 @@
 				<minimum>0.2</minimum>
 			</output>
 			<output>
-				<group>[Channel1]</group>
+				<group>[Channel2]</group>
 				<key>VuMeter</key>
-				<status>0xB0</status>
-				<midino>0x54</midino>
+				<status>0xB2</status>
+				<midino>0x53</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.4</minimum>
+				<minimum>0.2</minimum>
 			</output>
 			<output>
-				<group>[Channel1]</group>
+				<group>[Channel3]</group>
 				<key>VuMeter</key>
-				<status>0xB0</status>
-				<midino>0x55</midino>
+				<status>0xB1</status>
+				<midino>0x53</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.6</minimum>
+				<minimum>0.2</minimum>
 			</output>
 			<output>
-				<group>[Channel1]</group>
+				<group>[Channel4]</group>
 				<key>VuMeter</key>
-				<status>0xB0</status>
-				<midino>0x56</midino>
+				<status>0xB3</status>
+				<midino>0x53</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.8</minimum>
+				<minimum>0.2</minimum>
 			</output>
+			<!-- VU meter - 2nd green -->
 			<output>
 				<group>[Channel1]</group>
 				<key>VuMeter</key>
 				<status>0xB0</status>
-				<midino>0x57</midino>
+				<midino>0x54</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.87</minimum>
+				<minimum>0.4</minimum>
 			</output>
 			<output>
-				<group>[Channel1]</group>
+				<group>[Channel2]</group>
 				<key>VuMeter</key>
-				<status>0xB0</status>
-				<midino>0x58</midino>
+				<status>0xB2</status>
+				<midino>0x54</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.94</minimum>
+				<minimum>0.4</minimum>
 			</output>
 			<output>
-				<group>[Channel1]</group>
-				<key>PeakIndicator</key>
-				<status>0xB0</status>
-				<midino>0x59</midino>
+				<group>[Channel3]</group>
+				<key>VuMeter</key>
+				<status>0xB1</status>
+				<midino>0x54</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.5</minimum>
+				<minimum>0.4</minimum>
 			</output>
-
-			<!-- [Channel2] VU meter -->
 			<output>
-				<group>[Channel2]</group>
+				<group>[Channel4]</group>
 				<key>VuMeter</key>
-				<status>0xB2</status>
-				<midino>0x53</midino>
+				<status>0xB3</status>
+				<midino>0x54</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.2</minimum>
+				<minimum>0.4</minimum>
 			</output>
+			<!-- VU meter - 3rd green -->
 			<output>
-				<group>[Channel2]</group>
+				<group>[Channel1]</group>
 				<key>VuMeter</key>
-				<status>0xB2</status>
-				<midino>0x54</midino>
+				<status>0xB0</status>
+				<midino>0x55</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.4</minimum>
+				<minimum>0.6</minimum>
 			</output>
 			<output>
 				<group>[Channel2]</group>
@@ -1894,78 +1966,78 @@
 				<minimum>0.6</minimum>
 			</output>
 			<output>
-				<group>[Channel2]</group>
+				<group>[Channel3]</group>
 				<key>VuMeter</key>
-				<status>0xB2</status>
-				<midino>0x56</midino>
+				<status>0xB1</status>
+				<midino>0x55</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.8</minimum>
+				<minimum>0.6</minimum>
 			</output>
 			<output>
-				<group>[Channel2]</group>
+				<group>[Channel4]</group>
 				<key>VuMeter</key>
-				<status>0xB2</status>
-				<midino>0x57</midino>
+				<status>0xB3</status>
+				<midino>0x55</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.87</minimum>
+				<minimum>0.6</minimum>
 			</output>
+			<!-- VU meter - 1st yellow -->
 			<output>
-				<group>[Channel2]</group>
+				<group>[Channel1]</group>
 				<key>VuMeter</key>
-				<status>0xB2</status>
-				<midino>0x58</midino>
+				<status>0xB0</status>
+				<midino>0x56</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.94</minimum>
+				<minimum>0.8</minimum>
 			</output>
 			<output>
 				<group>[Channel2]</group>
-				<key>PeakIndicator</key>
+				<key>VuMeter</key>
 				<status>0xB2</status>
-				<midino>0x59</midino>
+				<midino>0x56</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.5</minimum>
+				<minimum>0.8</minimum>
 			</output>
-
-			<!-- [Channel3] VU meter -->
 			<output>
 				<group>[Channel3]</group>
 				<key>VuMeter</key>
 				<status>0xB1</status>
-				<midino>0x53</midino>
+				<midino>0x56</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.2</minimum>
+				<minimum>0.8</minimum>
 			</output>
 			<output>
-				<group>[Channel3]</group>
+				<group>[Channel4]</group>
 				<key>VuMeter</key>
-				<status>0xB1</status>
-				<midino>0x54</midino>
+				<status>0xB3</status>
+				<midino>0x56</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.4</minimum>
+				<minimum>0.8</minimum>
 			</output>
+			<!-- VU meter - 2nd yellow -->
 			<output>
-				<group>[Channel3]</group>
+				<group>[Channel1]</group>
 				<key>VuMeter</key>
-				<status>0xB1</status>
-				<midino>0x55</midino>
+				<status>0xB0</status>
+				<midino>0x57</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.6</minimum>
+				<minimum>0.87</minimum>
 			</output>
 			<output>
-				<group>[Channel3]</group>
+				<group>[Channel2]</group>
 				<key>VuMeter</key>
-				<status>0xB1</status>
-				<midino>0x56</midino>
+				<status>0xB2</status>
+				<midino>0x57</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.8</minimum>
+				<minimum>0.87</minimum>
 			</output>
 			<output>
 				<group>[Channel3]</group>
@@ -1977,78 +2049,78 @@
 				<minimum>0.87</minimum>
 			</output>
 			<output>
-				<group>[Channel3]</group>
+				<group>[Channel4]</group>
 				<key>VuMeter</key>
-				<status>0xB1</status>
-				<midino>0x58</midino>
+				<status>0xB3</status>
+				<midino>0x57</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.94</minimum>
+				<minimum>0.87</minimum>
 			</output>
+			<!-- VU meter - 3rd yellow -->
 			<output>
-				<group>[Channel3]</group>
-				<key>PeakIndicator</key>
-				<status>0xB1</status>
-				<midino>0x59</midino>
+				<group>[Channel1]</group>
+				<key>VuMeter</key>
+				<status>0xB0</status>
+				<midino>0x58</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.5</minimum>
+				<minimum>0.94</minimum>
 			</output>
-
-			<!-- [Channel4] VU meter -->
 			<output>
-				<group>[Channel4]</group>
+				<group>[Channel2]</group>
 				<key>VuMeter</key>
-				<status>0xB3</status>
-				<midino>0x53</midino>
+				<status>0xB2</status>
+				<midino>0x58</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.2</minimum>
+				<minimum>0.94</minimum>
 			</output>
 			<output>
-				<group>[Channel4]</group>
+				<group>[Channel3]</group>
 				<key>VuMeter</key>
-				<status>0xB3</status>
-				<midino>0x54</midino>
+				<status>0xB1</status>
+				<midino>0x58</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.4</minimum>
+				<minimum>0.94</minimum>
 			</output>
 			<output>
 				<group>[Channel4]</group>
 				<key>VuMeter</key>
 				<status>0xB3</status>
-				<midino>0x55</midino>
+				<midino>0x58</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.6</minimum>
+				<minimum>0.94</minimum>
 			</output>
+			<!-- VU meter - red (peak) -->
 			<output>
-				<group>[Channel4]</group>
-				<key>VuMeter</key>
-				<status>0xB3</status>
-				<midino>0x56</midino>
+				<group>[Channel1]</group>
+				<key>PeakIndicator</key>
+				<status>0xB0</status>
+				<midino>0x59</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.8</minimum>
+				<minimum>0.5</minimum>
 			</output>
 			<output>
-				<group>[Channel4]</group>
-				<key>VuMeter</key>
-				<status>0xB3</status>
-				<midino>0x57</midino>
+				<group>[Channel2]</group>
+				<key>PeakIndicator</key>
+				<status>0xB2</status>
+				<midino>0x59</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.87</minimum>
+				<minimum>0.5</minimum>
 			</output>
 			<output>
-				<group>[Channel4]</group>
-				<key>VuMeter</key>
-				<status>0xB3</status>
-				<midino>0x58</midino>
+				<group>[Channel3]</group>
+				<key>PeakIndicator</key>
+				<status>0xB1</status>
+				<midino>0x59</midino>
 				<on>0x01</on>
 				<off>0x00</off>
-				<minimum>0.94</minimum>
+				<minimum>0.5</minimum>
 			</output>
 			<output>
 				<group>[Channel4]</group>