diff options
| -rw-r--r-- | CHANGELOG | 35 | ||||
| -rw-r--r-- | Mixxx-Manual.pdf | bin | 3895300 -> 3825841 bytes | |||
| -rw-r--r-- | build/depends.py | 5 | ||||
| -rw-r--r-- | res/controllers/Vestax VCI-400.midi.xml | 2334 | ||||
| -rw-r--r-- | res/controllers/Vestax-VCI-400-scripts.js | 34 | ||||
| -rw-r--r-- | res/controllers/common-controller-scripts.js | 3 | ||||
| -rw-r--r-- | src/dialog/dlgabout.cpp | 40 | ||||
| -rw-r--r-- | src/vinylcontrol/vinylcontrol.cpp | 6 |
8 files changed, 1240 insertions, 1217 deletions
@@ -1,23 +1,34 @@ -==== 2.2.0 (draft) 2018-09-12 ==== +==== 2.2.0 2018-12-17 ==== +General * Update from Qt4 to Qt5. -* Remove GUI scaling option from preferences; use Qt5's automatic - scaling instead. +* Use Qt5's automatic high DPI scaling (and remove the old + scaling option from the preferences). +* Vectorize remaining raster graphics for better HiDPI support. + +Effects * Add mix mode switch (Dry/Wet vs Dry+Wet) for effect units. -* Add support for LV2 effects plugins. (currently no way to show plugin GUIs) +* Add support for LV2 effects plugins (currently no way to show plugin GUIs). * Add preference option for selecting which effects are shown in the - list of available effects in the main window. (all LV2 effects are - hidden by default and must be explicitly enabled by users) -* Add preference option for adjusting play position marker of + list of available effects in the main window (all LV2 effects are + hidden by default and must be explicitly enabled by users). + +Skins +* Add 8 sampler and small sampler options to LateNight. +* Add key / BPM expansion indicators to Deere decks. +* Add skin settings menu to LateNight. + +Controllers +* Add controller mapping for Numark Mixtrack Platinum. +* Update controller mapping for Numark N4. +* Add spinback and break for Vestax VCI-400 mapping. + +Miscellaneous +* Add preference option to adjust the play position marker of scrolling waveforms. * Add preference option to adjust opacity of beatgrid markers on scrolling waveforms. -* Add 8 sampler and small sampler options to LateNight. -* Add key / BPM expansion indicators to Deere decks. -* Vectorize Deere, LateNight and Tango skin assets for better HiDPI support. -* Behringer CMD-MM1 controller preset improvements. * Support IRC/AIM/ICQ broadcast metadata. -* Add skin settings menu to LateNight. ==== 2.1.5 2018-10-28 ==== diff --git a/Mixxx-Manual.pdf b/Mixxx-Manual.pdf Binary files differindex d42a9391ac..c82442963a 100644 --- a/Mixxx-Manual.pdf +++ b/Mixxx-Manual.pdf diff --git a/build/depends.py b/build/depends.py index aaa4f8c06e..5b6f702074 100644 --- a/build/depends.py +++ b/build/depends.py @@ -221,8 +221,6 @@ class Qt(Dependence): 'QtWidgets', 'QtXml', ] - if build.platform_is_linux: - build.env.Append(LIBS = ['Qt5X11Extras'] ) if build.platform_is_windows: qt_modules.extend([ # Keep alphabetized. @@ -281,6 +279,9 @@ class Qt(Dependence): if not conf.CheckForPKG('Qt5Core', '5.0'): raise Exception('Qt >= 5.0 not found') + if not conf.CheckLib('Qt5X11Extras'): + raise Exception('Could not find Qt5X11Extras or its development headers') + qt_modules.extend(['QtDBus']) # This automatically converts QtXXX to Qt5XXX where appropriate. build.env.EnableQt5Modules(qt_modules, debug=False) diff --git a/res/controllers/Vestax VCI-400.midi.xml b/res/controllers/Vestax VCI-400.midi.xml index 3b004e4583..f5cca9bf7e 100644 --- a/res/controllers/Vestax VCI-400.midi.xml +++ b/res/controllers/Vestax VCI-400.midi.xml @@ -8,851 +8,741 @@ </info> <controller id="Vestax"> <scriptfiles> - <file functionprefix="VestaxVCI400" filename="Vestax-VCI-400-scripts.js"/> + <file filename="Vestax-VCI-400-scripts.js" functionprefix="VestaxVCI400"/> </scriptfiles> <controls> <control> - <group>[Playlist]</group> - <key>LoadSelectedIntoFirstStopped</key> - <description>MIDI Learned from 4 messages.</description> - <status>0x9E</status> - <midino>0x71</midino> + <group>[Master]</group> + <key>VestaxVCI400.shiftActivate</key> + <status>0x90</status> + <midino>0x01</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> <group>[Channel1]</group> - <key>VestaxVCI400.wheelTouch</key> + <key>sync_enabled</key> + <description>MIDI Learned from 22 messages.</description> <status>0x92</status> - <midino>0x27</midino> + <midino>0x01</midino> <options> - <script-binding/> + <normal/> </options> </control> <control> <group>[Channel2]</group> - <key>VestaxVCI400.wheelTouch</key> + <key>sync_enabled</key> + <description>MIDI Learned from 88 messages.</description> <status>0x93</status> - <midino>0x27</midino> + <midino>0x01</midino> <options> - <script-binding/> + <normal/> </options> </control> <control> <group>[Channel3]</group> - <key>VestaxVCI400.wheelTouch</key> + <key>sync_enabled</key> + <description>MIDI Learned from 24 messages.</description> <status>0x94</status> - <midino>0x27</midino> + <midino>0x01</midino> <options> - <script-binding/> + <normal/> </options> </control> <control> <group>[Channel4]</group> - <key>VestaxVCI400.wheelTouch</key> + <key>sync_enabled</key> + <description>MIDI Learned from 90 messages.</description> <status>0x95</status> - <midino>0x27</midino> - <options> - <script-binding/> - </options> - </control> - <control> - <group>[Channel1]</group> - <key>reverseroll</key> - <description>MIDI Learned from 36 messages.</description> - <status>0x94</status> - <midino>0x26</midino> + <midino>0x01</midino> <options> <normal/> </options> </control> <control> - <group>[Channel4]</group> - <key>reverseroll</key> - <description>MIDI Learned from 54 messages.</description> - <status>0x95</status> - <midino>0x26</midino> + <group>[Master]</group> + <key>VestaxVCI400.fx1ToggleButton1</key> + <status>0x9C</status> + <midino>0x01</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> - <group>[Channel3]</group> - <key>vinylcontrol_enabled</key> - <description>MIDI Learned from 14 messages.</description> - <status>0x94</status> - <midino>0x25</midino> + <group>[Master]</group> + <key>VestaxVCI400.fx2ToggleButton1</key> + <status>0x9D</status> + <midino>0x01</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> - <group>[Channel3]</group> - <key>VestaxVCI400.deckSwitch</key> - <status>0x92</status> - <midino>0x23</midino> + <group>[Channel1]</group> + <key>beatsync</key> + <status>0xB2</status> + <midino>0x01</midino> <options> - <script-binding/> + <normal/> </options> </control> <control> - <group>[Channel4]</group> - <key>vinylcontrol_enabled</key> - <description>MIDI Learned from 16 messages.</description> - <status>0x95</status> - <midino>0x25</midino> + <group>[Channel2]</group> + <key>beatsync</key> + <status>0xB3</status> + <midino>0x01</midino> <options> <normal/> </options> </control> <control> - <group>[Channel3]</group> - <key>vinylcontrol_mode</key> - <description>MIDI Learned from 4 messages.</description> - <status>0x94</status> - <midino>0x24</midino> + <group>[EffectRack1_EffectUnit1_Effect1]</group> + <key>parameter1</key> + <description>MIDI Learned from 54 messages.</description> + <status>0xBC</status> + <midino>0x01</midino> <options> <normal/> </options> </control> <control> - <group>[Channel4]</group> - <key>VestaxVCI400.deckSwitch</key> - <status>0x93</status> - <midino>0x23</midino> + <group>[EffectRack1_EffectUnit2_Effect1]</group> + <key>parameter1</key> + <description>MIDI Learned from 144 messages.</description> + <status>0xBD</status> + <midino>0x01</midino> <options> - <script-binding/> + <normal/> </options> </control> <control> <group>[Channel1]</group> - <key>VestaxVCI400.deckSwitch</key> + <key>VestaxVCI400.loadTrack</key> + <description>MIDI Learned from 96 messages.</description> <status>0x92</status> - <midino>0x22</midino> + <midino>0x02</midino> <options> <script-binding/> </options> </control> <control> - <group>[Channel4]</group> - <key>vinylcontrol_mode</key> - <description>MIDI Learned from 8 messages.</description> - <status>0x95</status> - <midino>0x24</midino> + <group>[Channel2]</group> + <key>VestaxVCI400.loadTrack</key> + <description>MIDI Learned from 98 messages.</description> + <status>0x93</status> + <midino>0x02</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> <group>[Channel3]</group> - <key>reverseroll</key> - <description>MIDI Learned from 42 messages.</description> + <key>VestaxVCI400.loadTrack</key> + <description>MIDI Learned from 100 messages.</description> <status>0x94</status> - <midino>0x23</midino> + <midino>0x02</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> - <group>[Channel2]</group> - <key>VestaxVCI400.deckSwitch</key> - <status>0x93</status> - <midino>0x22</midino> + <group>[Channel4]</group> + <key>VestaxVCI400.loadTrack</key> + <description>MIDI Learned from 102 messages.</description> + <status>0x95</status> + <midino>0x02</midino> <options> <script-binding/> </options> </control> <control> - <group>[Channel2]</group> - <key>reverseroll</key> - <description>MIDI Learned from 48 messages.</description> - <status>0x95</status> - <midino>0x23</midino> + <group>[Master]</group> + <key>VestaxVCI400.fx1ToggleButton2</key> + <status>0x9C</status> + <midino>0x02</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> - <group>[Channel1]</group> - <key>reverseroll</key> - <description>MIDI Learned from 6 messages.</description> - <status>0x94</status> - <midino>0x22</midino> + <group>[Master]</group> + <key>VestaxVCI400.fx2ToggleButton2</key> + <status>0x9D</status> + <midino>0x02</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> - <group>[Channel4]</group> - <key>reverseroll</key> - <description>MIDI Learned from 30 messages.</description> - <status>0x95</status> - <midino>0x22</midino> + <group>[Channel1]</group> + <key>VestaxVCI400.loadTrack</key> + <status>0xB2</status> + <midino>0x02</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> - <group>[Channel3]</group> - <key>play</key> - <description>MIDI Learned from 8 messages.</description> - <status>0x94</status> - <midino>0x21</midino> + <group>[Channel2]</group> + <key>VestaxVCI400.loadTrack</key> + <status>0xB3</status> + <midino>0x02</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> - <group>[Channel4]</group> - <key>play</key> - <description>MIDI Learned from 26 messages.</description> - <status>0x95</status> - <midino>0x21</midino> + <group>[EffectRack1_EffectUnit1_Effect1]</group> + <key>parameter2</key> + <description>MIDI Learned from 120 messages.</description> + <status>0xBC</status> + <midino>0x02</midino> <options> <normal/> </options> </control> <control> - <group>[Channel3]</group> - <key>cue_default</key> - <description>MIDI Learned from 25 messages.</description> - <status>0x94</status> - <midino>0x20</midino> + <group>[EffectRack1_EffectUnit2_Effect1]</group> + <key>parameter2</key> + <description>MIDI Learned from 308 messages.</description> + <status>0xBD</status> + <midino>0x02</midino> <options> <normal/> </options> </control> <control> - <group>[Channel1]</group> - <key>vinylcontrol_enabled</key> - <description>MIDI Learned from 10 messages.</description> + <group>[EffectRack1_EffectUnit1]</group> + <key>group_[Channel1]_enable</key> + <description>MIDI Learned from 2 messages.</description> <status>0x92</status> - <midino>0x1E</midino> + <midino>0x03</midino> <options> <normal/> </options> </control> <control> - <group>[Channel4]</group> - <key>cue_default</key> - <description>MIDI Learned from 42 messages.</description> - <status>0x95</status> - <midino>0x20</midino> + <group>[EffectRack1_EffectUnit1]</group> + <key>group_[Channel2]_enable</key> + <description>MIDI Learned from 6 messages.</description> + <status>0x93</status> + <midino>0x03</midino> <options> <normal/> </options> </control> <control> - <group>[Channel3]</group> - <key>reverseroll</key> - <description>MIDI Learned from 24 messages.</description> + <group>[EffectRack1_EffectUnit1]</group> + <key>group_[Channel3]_enable</key> + <description>MIDI Learned from 10 messages.</description> <status>0x94</status> - <midino>0x1F</midino> + <midino>0x03</midino> <options> <normal/> </options> </control> <control> - <group>[Channel2]</group> - <key>vinylcontrol_enabled</key> - <description>MIDI Learned from 12 messages.</description> - <status>0x93</status> - <midino>0x1E</midino> + <group>[EffectRack1_EffectUnit1]</group> + <key>group_[Channel4]_enable</key> + <description>MIDI Learned from 14 messages.</description> + <status>0x95</status> + <midino>0x03</midino> <options> <normal/> </options> </control> <control> - <group>[Channel1]</group> - <key>vinylcontrol_mode</key> - <description>MIDI Learned from 2 messages.</description> - <status>0x92</status> - <midino>0x1D</midino> + <group>[Master]</group> + <key>VestaxVCI400.fx1ToggleButton3</key> + <status>0x9C</status> + <midino>0x03</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> - <group>[Channel2]</group> - <key>reverseroll</key> - <description>MIDI Learned from 24 messages.</description> - <status>0x95</status> - <midino>0x1F</midino> + <group>[Master]</group> + <key>VestaxVCI400.fx2ToggleButton3</key> + <status>0x9D</status> + <midino>0x03</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> - <group>[Channel1]</group> - <key>reverseroll</key> - <description>MIDI Learned from 6 messages.</description> - <status>0x94</status> - <midino>0x1E</midino> + <group>[EffectRack1_EffectUnit1_Effect1]</group> + <key>parameter3</key> + <description>MIDI Learned from 116 messages.</description> + <status>0xBC</status> + <midino>0x03</midino> <options> <normal/> </options> </control> <control> - <group>[Channel2]</group> - <key>vinylcontrol_mode</key> - <description>MIDI Learned from 6 messages.</description> - <status>0x93</status> - <midino>0x1D</midino> + <group>[EffectRack1_EffectUnit2_Effect1]</group> + <key>parameter3</key> + <description>MIDI Learned from 330 messages.</description> + <status>0xBD</status> + <midino>0x03</midino> <options> <normal/> </options> </control> <control> - <group>[Channel1]</group> - <key>play</key> - <description>MIDI Learned from 2 messages.</description> + <group>[EffectRack1_EffectUnit2]</group> + <key>group_[Channel1]_enable</key> + <description>MIDI Learned from 4 messages.</description> <status>0x92</status> - <midino>0x1C</midino> + <midino>0x04</midino> <options> <normal/> </options> </control> <control> - <group>[Channel4]</group> - <key>reverseroll</key> - <description>MIDI Learned from 82 messages.</description> - <status>0x95</status> - <midino>0x1E</midino> + <group>[EffectRack1_EffectUnit2]</group> + <key>group_[Channel2]_enable</key> + <description>MIDI Learned from 8 messages.</description> + <status>0x93</status> + <midino>0x04</midino> <options> <normal/> </options> </control> <control> - <group>[Channel3]</group> - <key>play</key> - <description>MIDI Learned from 8 messages.</description> + <group>[EffectRack1_EffectUnit2]</group> + <key>group_[Channel3]_enable</key> + <description>MIDI Learned from 12 messages.</description> <status>0x94</status> - <midino>0x1D</midino> + <midino>0x04</midino> <options> <normal/> </options> </control> <control> - <group>[Channel2]</group> - <key>play</key> - <description>MIDI Learned from 20 messages.</description> - <status>0x93</status> - <midino>0x1C</midino> + <group>[EffectRack1_EffectUnit2]</group> + <key>group_[Channel4]_enable</key> + <description>MIDI Learned from 16 messages.</description> + <status>0x95</status> + <midino>0x04</midino> <options> <normal/> </options> </control> <control> - <group>[Channel1]</group> - <key>cue_default</key> - <description>MIDI Learned from 4 messages.</description> - <status>0x92</status> - <midino>0x1B</midino> + <group>[Master]</group> + <key>VestaxVCI400.fx1ToggleButton4</key> + <status>0x9C</status> + <midino>0x04</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> - <group>[Channel4]</group> - <key>play</key> - <description>MIDI Learned from 78 messages.</description> - <status>0x95</status> - <midino>0x1D</midino> + <group>[Master]</group> + <key>VestaxVCI400.fx2ToggleButton4</key> + <status>0x9D</status> + <midino>0x04</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> - <group>[Channel3]</group> - <key>cue_default</key> - <description>MIDI Learned from 2 messages.</description> - <status>0x94</status> - <midino>0x1C</midino> + <group>[EffectRack1_EffectUnit2]</group> + <key>VestaxVCI400.fx1Knob</key> + <description>MIDI Learned from 144 messages.</description> + <status>0xBC</status> + <midino>0x04</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> - <group>[Channel2]</group> - <key>cue_default</key> - <description>MIDI Learned from 22 messages.</description> - <status>0x93</status> - <midino>0x1B</midino> + <group>[EffectRack1_EffectUnit2]</group> + <key>VestaxVCI400.fx2Knob</key> + <description>MIDI Learned from 144 messages.</description> + <status>0xBD</status> + <midino>0x04</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> <group>[Channel1]</group> - <key>play</key> - <description>MIDI Learned from 2 messages.</description> + <key>pfl</key> + <description>MIDI Learned from 46 messages.</description> <status>0x92</status> - <midino>0x1A</midino> + <midino>0x05</midino> <options> <normal/> </options> </control> <control> - <group>[Channel4]</group> - <key>cue_default</key> - <description>MIDI Learned from 80 messages.</description> - <status>0x95</status> - <midino>0x1C</midino> + <group>[Channel2]</group> + <key>pfl</key> + <description>MIDI Learned from 60 messages.</description> + <status>0x93</status> + <midino>0x05</midino> <options> <normal/> </options> </control> <control> <group>[Channel3]</group> - <key>reverseroll</key> - <description>MIDI Learned from 12 messages.</description> + <key>pfl</key> + <description>MIDI Learned from 17 messages.</description> <status>0x94</status> - <midino>0x1B</midino> - <options> - <normal/> - </options> - </control> - <control> - <group>[Channel2]</group> - <key>play</key> - <description>MIDI Learned from 14 messages.</description> - <status>0x93</status> - <midino>0x1A</midino> + <midino>0x05</midino> <options> <normal/> </options> </control> <control> - <group>[Channel1]</group> - <key>cue_default</key> - <description>MIDI Learned from 4 messages.</description> - <status>0x92</status> - <midino>0x19</midino> + <group>[Channel4]</group> + <key>pfl</key> + <description>MIDI Learned from 70 messages.</description> + <status>0x95</status> + <midino>0x05</midino> <options> <normal/> </options> </control> <control> <group>[Channel1]</group> - <key>VestaxVCI400.modeSampler</key> - <status>0x92</status> - <midino>0x18</midino> + <key>VestaxVCI400.pitchKnob</key> + <description>MIDI Learned from 35 messages.</description> + <status>0xB2</status> + <midino>0x05</midino> <options> <script-binding/> </options> </control> <control> <group>[Channel2]</group> - <key>reverseroll</key> - <description>MIDI Learned from 18 messages.</description> - <status>0x95</status> - <midino>0x1B</midino> + <key>VestaxVCI400.pitchKnob</key> + <status>0xB3</status> + <midino>0x05</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> - <group>[Channel2]</group> - <key>cue_default</key> - <description>MIDI Learned from 16 messages.</description> - <status>0x93</status> - <midino>0x19</midino> + <group>[Channel3]</group> + <key>VestaxVCI400.pitchKnob</key> + <status>0xB4</status> + <midino>0x05</midino> <options> - <normal/> + <script-binding/> </options> </control> <control> - <group>[Channel2]</group> - <key>VestaxVCI400.modeSampler</key> - <status>0x93</status> - <midino>0x18</midino> + <group>[Channel4]</group> + <key>VestaxVCI400.pitchKnob</key> + <status>0xB5</status> + <midino>0x05</midino> <options> <script-binding/> </options> </control> <control> <group>[Channel1]</group> - <key>VestaxVCI400.modeRoll</key> + <key>VestaxVCI400.vinylButton</key> + <description>MIDI Learned from 2 messages.</description> <status>0x92</status> - <midino>0x17</midino> - <options> - <script-binding/> - </options> - </control> - <control> - <group>[Channel3]</group> - <key>VestaxVCI400.modeSampler</key> - <status>0x94</status> - <midino>0x18</midino> + <midino>0x06</midino> <options> <script-binding/> </options> </control> <control> <group>[Channel2]</group> - <key>VestaxVCI400.modeRoll</key> + <key>VestaxVCI400.vinylButton</key> + <description>MIDI Learned from 6 messages.</description> <status>0x93</status> - <midino>0x17</midino> + <midino>0x06</midino> <options> <script-binding/> </options> </control> <control> - <group>[Channel1]</group> - <key>VestaxVCI400.modeLoop</key> - <status>0x92& |