Update midi-components library

and change cue color CO name
mixxxdj · Nov 3, 2019 · 3196155 · 3196155
1 parent e99e1a8
commit 3196155
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js
@@ -1476,7 +1476,7 @@ DJ505.PitchPlayMode = function (deck, offset) {
         this.number = n + 1;
         this.on = this.color + DJ505.PadColor.DIM_MODIFIER;
         this.colors = pitchplayColors;
-        this.colorIdKey = 'hotcue_' + this.number + '_color_id';
+        this.colorIdKey = 'hotcue_' + this.number + '_color';
         components.Button.call(this);
     };
     this.PerformancePad.prototype = new components.Button({

diff --git a/res/controllers/midi-components-0.0.js b/res/controllers/midi-components-0.0.js
@@ -295,9 +295,9 @@
             return;
         }
         if (options.colors !== undefined || options.sendRGB !== undefined) {
-            this.colorIdKey = 'hotcue_' + options.number + '_color_id';
+            this.colorKey = 'hotcue_' + options.number + '_color';
             if (options.colors === undefined) {
-                options.colors = color.predefinedColorsList();
+                options.colors = color.hotcueColorPalette();
             }
         }
         this.number = options.number;
@@ -312,8 +312,8 @@
             this.inKey = 'hotcue_' + this.number + '_clear';
         },
         getColor: function() {
-            if (this.colorIdKey !== undefined) {
-                return color.predefinedColorFromId(engine.getValue(this.group,this.colorIdKey));
+            if (this.colorKey !== undefined) {
+                return color.colorFromHexCode(engine.getValue(this.group,this.colorKey));
             } else {
                 return null;
             }
@@ -324,8 +324,8 @@
             // and there is no hotcueColor for turning the LED
             // off. So the `send()` function is responsible for turning the 
             // actual LED off.
-            if (this.colorIdKey !== undefined && outval !== this.off) {
-                this.outputColor(engine.getValue(this.group, this.colorIdKey));
+            if (this.colorKey !== undefined && outval !== this.off) {
+                this.outputColor(engine.getValue(this.group, this.colorKey));
             } else {
                 this.send(outval);
             }
@@ -348,8 +348,8 @@
         },
         connect: function() {
             Button.prototype.connect.call(this); // call parent connect
-            if (undefined !== this.group && this.colorIdKey !== undefined) {
-                this.connections[1] = engine.makeConnection(this.group, this.colorIdKey, function (id) {
+            if (undefined !== this.group && this.colorKey !== undefined) {
+                this.connections[1] = engine.makeConnection(this.group, this.colorKey, function (id) {
                     if (engine.getValue(this.group,this.outKey)) {
                         this.outputColor(id);
                     }

diff --git a/res/skins/Deere/hotcue_button.xml b/res/skins/Deere/hotcue_button.xml
@@ -46,7 +46,7 @@
       <ConnectValueFromWidget>false</ConnectValueFromWidget>
     </Connection>
     <Connection>
-      <ConfigKey><Variable name="group"/>,hotcue_<Variable name="hotcue"/>_color_id</ConfigKey>
+      <ConfigKey><Variable name="group"/>,hotcue_<Variable name="hotcue"/>_color</ConfigKey>
       <BindProperty>highlight</BindProperty>
     </Connection>
   </PushButton>

diff --git a/res/skins/LateNight/button_hotcue.xml b/res/skins/LateNight/button_hotcue.xml
@@ -28,7 +28,7 @@
       <ConnectValueFromWidget>false</ConnectValueFromWidget>
     </Connection>
     <Connection>
-      <ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_color_id</ConfigKey>
+      <ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_color</ConfigKey>
       <BindProperty>highlight</BindProperty>
     </Connection>
   </PushButton>

diff --git a/res/skins/Shade/deck_hotcue_button.xml b/res/skins/Shade/deck_hotcue_button.xml
@@ -33,7 +33,7 @@
       <ConnectValueFromWidget>false</ConnectValueFromWidget>
     </Connection>
     <Connection>
-      <ConfigKey>[Channel<Variable name="channum"/>],hotcue_<Variable name="hotcue"/>_color_id</ConfigKey>
+      <ConfigKey>[Channel<Variable name="channum"/>],hotcue_<Variable name="hotcue"/>_color</ConfigKey>
       <BindProperty>highlight</BindProperty>
     </Connection>
   </PushButton>

diff --git a/res/skins/Tango/button_hotcue_deck.xml b/res/skins/Tango/button_hotcue_deck.xml
@@ -38,7 +38,7 @@ Variables:
       <ConnectValueFromWidget>false</ConnectValueFromWidget>
     </Connection>
     <Connection>
-      <ConfigKey><Variable name="group"/>,hotcue_<Variable name="HotCue"/>_color_id</ConfigKey>
+      <ConfigKey><Variable name="group"/>,hotcue_<Variable name="HotCue"/>_color</ConfigKey>
       <BindProperty>highlight</BindProperty>
     </Connection>
   </PushButton>

diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp
@@ -1705,7 +1705,7 @@ HotcueControl::HotcueControl(QString group, int i)
     m_hotcueEnabled->setReadOnly();
 
     // The id of the predefined color assigned to this color.
-    m_hotcueColor = new ControlObject(keyForControl(i, "color_id"));
+    m_hotcueColor = new ControlObject(keyForControl(i, "color"));
     connect(m_hotcueColor,
             &ControlObject::valueChanged,
             this,