Mixxx

Merge lp://qastaging/~zestoi/mixxx/controller_scripts into lp://qastaging/~mixxxdevelopers/mixxx/trunk

  1. controller_scripts
  2. Merge into trunk
Proposed by Zestoi
Status: Merged
Merged at revision: 3213
Proposed branch: lp://qastaging/~zestoi/mixxx/controller_scripts
Merge into: lp://qastaging/~mixxxdevelopers/mixxx/trunk
Diff against target: 3109 lines (+3045/-2)
9 files modified
mixxx/res/controllers/DJ-Tech CDJ-101.midi.xml (+196/-0)
mixxx/res/controllers/DJ-Tech DJM-101.midi.xml (+204/-0)
mixxx/res/controllers/DJ-Tech-CDJ-101-scripts.js (+245/-0)
mixxx/res/controllers/DJ-Tech-DJM-101-scripts.js (+110/-0)
mixxx/res/controllers/Hercules DJ Console Mk2.cntrlr.xml (+13/-0)
mixxx/res/controllers/Hercules-DJ-Console-Mk2-hid-scripts.js (+611/-0)
mixxx/res/controllers/Novation Launchpad.midi.xml (+736/-0)
mixxx/res/controllers/Novation-Launchpad-scripts.js (+819/-0)
mixxx/res/controllers/common-controller-scripts.js (+111/-2)
To merge this branch: bzr merge lp://qastaging/~zestoi/mixxx/controller_scripts
Reviewer Review Type Date Requested Status
Mixxx Development Team Pending
Review via email: mp+107519@code.qastaging.launchpad.net

Description of the change

new controller mappings:

* hercules dj console mk2 (hid)
* djtech cdj101
* djtech djm101
* novation launchpad (full led feedback and a "virtual mixer" page)

updates to common-controller-scripts.js:

* new effects functions: script.spinback(), script.brake(), script.spinbackDefault(), script.brakeDefault()

* fix to script.pitch() as it wasn't returning the value from script.midiPitch() only calling it

To post a comment you must log in.
lp://qastaging/~zestoi/mixxx/controller_scripts updated
3210. By Owen Williams

Fix rate range setting not getting saved properly (float equality testing fail)

3211. By RJ Skerry-Ryan

Use track-ids instead of TrackPointers to keep the recent tracks window.

3212. By RJ Skerry-Ryan

Merging from lp:~zestoi/mixxx/spinback_brake

3213. By RJ Skerry-Ryan

Merging from lp:~zestoi/mixxx/controller_scripts

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches