diff options
128 files changed, 3052 insertions, 1816 deletions
diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js index 1423d21faa..2e2777c0e8 100644 --- a/res/controllers/Roland_DJ-505-scripts.js +++ b/res/controllers/Roland_DJ-505-scripts.js @@ -1013,9 +1013,32 @@ DJ505.PadSection = function (deck, offset) { * 0x0A Coral 0x1A Coral (Dim) * 0x0B Azure 0x1B Azure (Dim) * 0x0C Turquoise 0x1C Turquoise (Dim) - * 0x0C Aquamarine 0x1C Aquamarine (Dim) + * 0x0D Aquamarine 0x1D Aquamarine (Dim) * 0x0E Green 0x1E Green (Dim) * 0x0F White 0x1F White (Dim) + * + * Serato DJ Pro maps its cue colors to MIDI values like this: + * + * Number Default Cue Serato Color MIDI value Color + * ------ ------------ ----------------- --------- ---------- + * 1 1 #CC0000 / #C02626 0x01 Red + * 2 #CC4400 / #DB4E27 0x0A Coral + * 3 2 #CC8800 / #F8821A 0x02 Orange + * 4 4 #CCCC00 / #FAC313 0x04 Yellow + * 5 #88CC00 / #4EB648 0x0E Green + * 6 #44CC00 / #006838 0x0E Green + * 7 5 #00CC00 / #1FAD26 0x05 Applegreen + * 8 #00CC44 / #8DC63F 0x0D Aquamarine + * 9 #00CC88 / #2B3673 0x0D Aquamarine + * 10 7 #00CCCC / #1DBEBD 0x0C Turquoise + * 11 #0088CC / #0F88CA 0x07 Celeste + * 12 #0044CC / #16308B 0x03 Blue + * 13 3 #0000CC / #173BA2 0x03 Blue + * 14 #4400CC / #5C3F97 0x0B Azure + * 15 8 #8800CC / #6823B6 0x08 Purple + * 16 6 #CC00CC / #CE359E 0x06 Magenta + * 17 #CC0088 / #DC1D49 0x06 Magenta + * 18 #CC0044 / #C71136 0x01 Red */ components.ComponentContainer.call(this); this.modes = { diff --git a/res/schema.xml b/res/schema.xml index b091dd9c16..4795b8ee7c 100644 --- a/res/schema.xml +++ b/res/schema.xml @@ -440,12 +440,13 @@ METADATA </revision> <revision version="29" min_compatible="3"> <description> - Add source to cue. Default is MANUAL. - <!-- See track/cue.h. --> + This was used in the development of 2.3 to track whether cues were placed + manually or automatically. However, this turned out to be unnecessary. + This version is left as a placeholder so users who were using the master + branch will have their database updated correctly for the subsequent + schema change. </description> - <sql> - ALTER TABLE cues ADD COLUMN source INTEGER DEFAULT 2 NOT NULL; - </sql> + <sql/> </revision> <revision version="30" min_compatible="3"> <description> diff --git a/res/skins/Deere/icon/ic_autodj_addrandom.svg b/res/skins/Deere/icon/ic_autodj_addrandom.svg new file mode 100644 index 0000000000..f73d4bb381 --- /dev/null +++ b/res/skins/Deere/icon/ic_autodj_addrandom.svg @@ |
