Merge lp://qastaging/~hile/mixxx/hidscripts into lp://qastaging/~mixxxdevelopers/mixxx/trunk
Proposed by
Ilkka Tuohela
| Status: | Merged |
|---|---|
| Merged at revision: | 3293 |
| Proposed branch: | lp://qastaging/~hile/mixxx/hidscripts |
| Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk |
| Diff against target: |
4206 lines (+1100/-846) 16 files modified
mixxx/res/controllers/Behringer BCD3000.midi.xml (+0/-48) mixxx/res/controllers/Hercules DJ Console 4-Mx.midi.xml (+0/-48) mixxx/res/controllers/Hercules DJ Control AIR.midi.xml (+0/-72) mixxx/res/controllers/Ion Discover DJ.midi.xml (+4/-2) mixxx/res/controllers/Mixman DM2 (Linux).midi.xml (+2/-0) mixxx/res/controllers/Nintendo-Wiimote.js (+701/-96) mixxx/res/controllers/Novation Dicer.midi.xml (+0/-96) mixxx/res/controllers/Numark DJ2Go.midi.xml (+0/-42) mixxx/res/controllers/Numark MIXTRACK.midi.xml (+0/-60) mixxx/res/controllers/Numark Mixtrack Pro.midi.xml (+1/-43) mixxx/res/controllers/Numark Omni Control.midi.xml (+0/-66) mixxx/res/controllers/Pioneer CDJ HID.hid.xml (+6/-1) mixxx/res/controllers/Pioneer CDJ-2000.midi.xml (+12/-38) mixxx/res/controllers/Pioneer CDJ-850.midi.xml (+32/-98) mixxx/res/controllers/Pioneer-CDJ-HID.js (+220/-40) mixxx/res/controllers/common-hid-packet-parser.js (+122/-96) |
| 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
Latest fixes to the HID controller code:
- minor changes to HIDController javascript tool, support setting default input packet name explicitly (still defaults to 'control' if nothing is done), required for Wiimote mode changing
- Fixes to Pioneer CDJ HID mode to support CDJ-2000 better
- Added example input modes and stub functions to Wiimote mode for other data input packet modes in addition to default packet mode, added rumble support to Wiimote, swapped some wiimote buttons to more logical layout.
In addition to HID code changes, this patch removes <options> tags from MIDI controller <output> sections: these are invalid, mixxx does not have or process options for MIDI output controls.
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
