Merge lp://qastaging/~hile/mixxx/hidscripts into lp://qastaging/~mixxxdevelopers/mixxx/trunk
Proposed by
Ilkka Tuohela
| Status: | Merged |
|---|---|
| Merged at revision: | 3292 |
| Proposed branch: | lp://qastaging/~hile/mixxx/hidscripts |
| Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk |
| Diff against target: |
5929 lines (+2487/-1723) 56 files modified
mixxx/res/controllers/Akai MPD24.midi.xml (+3/-0) mixxx/res/controllers/American Audio RADIUS 2000 CH1.midi.xml (+2/-42) mixxx/res/controllers/American Audio RADIUS 2000 CH2.midi.xml (+2/-42) mixxx/res/controllers/Behringer BCD2000.midi.xml (+2/-49) mixxx/res/controllers/Behringer BCD3000.midi.xml (+3/-0) mixxx/res/controllers/DJ-Tech CDJ-101.midi.xml (+2/-2) mixxx/res/controllers/DJ-Tech DJM-101.midi.xml (+2/-2) mixxx/res/controllers/DJ-Tech i-Mix Reload.midi.xml (+3/-0) mixxx/res/controllers/DJTechTools MIDI Fighter.midi.xml (+1/-1) mixxx/res/controllers/Denon MC3000.midi.xml (+1/-1) mixxx/res/controllers/EKS Otus.cntrlr.xml (+1/-1) mixxx/res/controllers/EKS-Otus.js (+37/-21) mixxx/res/controllers/Evolution_Xsession.midi.xml (+2/-2) mixxx/res/controllers/FaderFoxDJ2.midi.xml (+4/-4) mixxx/res/controllers/HID Keyboard.cntrlr.xml.example (+1/-1) mixxx/res/controllers/HID Trackpad.cntrlr.xml.example (+1/-1) mixxx/res/controllers/Hercules DJ Console 4-Mx.midi.xml (+2/-1) mixxx/res/controllers/Hercules DJ Console Mac Edition.midi.xml (+2/-2) mixxx/res/controllers/Hercules DJ Console Mk2.cntrlr.xml (+1/-1) mixxx/res/controllers/Hercules DJ Console Mk4.midi.xml (+0/-45) mixxx/res/controllers/Hercules DJ Control AIR.midi.xml (+2/-1) mixxx/res/controllers/Hercules DJ Control MP3 e2.midi.xml (+0/-64) mixxx/res/controllers/M-Audio_Xponent.midi.xml (+113/-113) mixxx/res/controllers/M-Audio_Xsession_pro.midi.xml (+2/-2) mixxx/res/controllers/Midi-Keyboard.midi.xml (+2/-2) mixxx/res/controllers/MidiTech-MidiControl.midi.xml (+2/-2) mixxx/res/controllers/Mixman DM2 (OS X).midi.xml (+2/-0) mixxx/res/controllers/Mixman DM2 (Windows).midi.xml (+2/-2) mixxx/res/controllers/Nintendo Wiimote.cntrlr.xml (+1/-2) mixxx/res/controllers/Novation Launchpad.midi.xml (+2/-2) mixxx/res/controllers/Numark DJ2Go.midi.xml (+1/-14) mixxx/res/controllers/Numark MIXTRACK.midi.xml (+0/-13) mixxx/res/controllers/Numark Mixtrack Pro.midi.xml (+2/-1) mixxx/res/controllers/Numark N4.midi.xml (+2/-1) mixxx/res/controllers/Numark NS7.midi.xml (+1/-1) mixxx/res/controllers/Pioneer CDJ HID.cntrlr.xml (+1/-1) mixxx/res/controllers/Pioneer CDJ-2000.midi.xml (+1/-1) mixxx/res/controllers/Pioneer CDJ-850.midi.xml (+1/-1) mixxx/res/controllers/Pioneer-CDJ-HID.js (+279/-193) mixxx/res/controllers/Reloop TerminalMix4.midi.xml (+3/-3) mixxx/res/controllers/Sony SixxAxis.cntrlr.xml (+1/-1) mixxx/res/controllers/Stanton SCS.1d.midi.xml (+1/-1) mixxx/res/controllers/Stanton SCS.1m.midi.xml (+1/-1) mixxx/res/controllers/Stanton SCS.3d.midi.xml (+204/-190) mixxx/res/controllers/Stanton SCS.3m.midi.xml (+1/-1) mixxx/res/controllers/TrakProDJ iPad.midi.xml (+1/-1) mixxx/res/controllers/Traktor Kontrol F1 Samplers.cntrlr.xml (+0/-18) mixxx/res/controllers/Traktor Kontrol F1.cntrlr.xml (+18/-0) mixxx/res/controllers/Traktor Kontrol X1.midi.xml (+1/-3) mixxx/res/controllers/Traktor-Kontrol-F1-Samplers.js (+0/-578) mixxx/res/controllers/Traktor-Kontrol-F1-scripts.js (+788/-0) mixxx/res/controllers/Traktor-Kontrol-X1.js (+252/-276) mixxx/res/controllers/Vestax VCI-100-hile.midi.xml (+102/-0) mixxx/res/controllers/Vestax VCI-100.midi.xml (+0/-6) mixxx/res/controllers/Vestax-VCI-100-hile.js (+539/-0) mixxx/res/controllers/common-hid-packet-parser.js (+87/-10) |
| To merge this branch: | bzr merge lp://qastaging/~hile/mixxx/hidscripts |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mixxx Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
Again, updated HID controllers to latest versions. This now includes:
- very usable and functional Pioneer CDJ controlller (I used it on a gig already :)
- traktor X1 controller fixes (more sensible button layout)
- traktor F1 controller now can control both decks and samplers (press quant/capture)
- EKS Otus HID mapping fine tuning
- minor fixes to HIDController prototype
In addition, this patch includes changes to MIDI controller XML files. The fixes include:
- Comment out unsupported info elements
- Remove duplicate control and output declarations
- Add at least a dummy description to all files
- Fix Zestoi's MIDI mappings to use MixxxMIDIController instead of the HID XML mode
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
