Merge lp://qastaging/~mixxxdevelopers/mixxx/features_controllerAbstraction into lp://qastaging/~mixxxdevelopers/mixxx/trunk
Proposed by
RJ Skerry-Ryan
Status: | Superseded | ||||||||
---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp://qastaging/~mixxxdevelopers/mixxx/features_controllerAbstraction | ||||||||
Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk | ||||||||
Diff against target: |
21632 lines (+11597/-8152) 153 files modified
mixxx/SConstruct (+1/-1) mixxx/build/depends.py (+23/-22) mixxx/build/features.py (+47/-34) mixxx/lib/hidapi-0.7.0/LICENSE-orig.txt (+9/-0) mixxx/lib/hidapi-0.7.0/LICENSE.txt (+13/-0) mixxx/lib/hidapi-0.7.0/hidapi/hidapi.h (+383/-0) mixxx/lib/hidapi-0.7.0/linux/.gitignore (+13/-0) mixxx/lib/hidapi-0.7.0/linux/Makefile (+36/-0) mixxx/lib/hidapi-0.7.0/linux/README.txt (+63/-0) mixxx/lib/hidapi-0.7.0/linux/hid-libusb.c (+1386/-0) mixxx/lib/hidapi-0.7.0/linux/hid.c (+595/-0) mixxx/lib/hidapi-0.7.0/mac/.gitignore (+13/-0) mixxx/lib/hidapi-0.7.0/mac/Makefile (+32/-0) mixxx/lib/hidapi-0.7.0/mac/hid.c (+1122/-0) mixxx/lib/hidapi-0.7.0/windows/.gitignore (+11/-0) mixxx/lib/hidapi-0.7.0/windows/Makefile (+14/-0) mixxx/lib/hidapi-0.7.0/windows/Makefile.mingw (+32/-0) mixxx/lib/hidapi-0.7.0/windows/ddk_build/.gitignore (+2/-0) mixxx/lib/hidapi-0.7.0/windows/ddk_build/hidapi.def (+17/-0) mixxx/lib/hidapi-0.7.0/windows/ddk_build/makefile (+49/-0) mixxx/lib/hidapi-0.7.0/windows/ddk_build/sources (+23/-0) mixxx/lib/hidapi-0.7.0/windows/hid.c (+873/-0) mixxx/lib/hidapi-0.7.0/windows/hidapi.sln (+29/-0) mixxx/lib/hidapi-0.7.0/windows/hidapi.vcproj (+201/-0) mixxx/lib/hidapi-0.7.0/windows/hidtest.vcproj (+196/-0) mixxx/res/controllers/American-Audio-VMS4-scripts.js (+1/-1) mixxx/res/controllers/EKS Otus.js (+95/-0) mixxx/res/controllers/Eks Otus.cntrlr.xml (+13/-0) mixxx/res/controllers/Stanton-SCS1d-scripts.js (+87/-104) mixxx/res/controllers/Stanton-SCS3d-scripts.js (+23/-26) mixxx/res/controllers/common-controller-scripts.js (+47/-14) mixxx/res/mixxx.qrc (+1/-0) mixxx/src/SConscript (+10/-10) mixxx/src/controlbeat.cpp (+2/-1) mixxx/src/controlbeat.h (+1/-2) mixxx/src/controlgroupdelegate.cpp (+1/-1) mixxx/src/controllers/controller-preset.cpp (+147/-0) mixxx/src/controllers/controller.cpp (+153/-0) mixxx/src/controllers/controller.h (+128/-0) mixxx/src/controllers/controllerengine.cpp (+1132/-0) mixxx/src/controllers/controllerengine.h (+136/-0) mixxx/src/controllers/controllerenumerator.cpp (+28/-0) mixxx/src/controllers/controllerenumerator.h (+36/-0) mixxx/src/controllers/controllermanager.cpp (+315/-0) mixxx/src/controllers/controllermanager.h (+86/-0) mixxx/src/controllers/defs_controllers.h (+22/-0) mixxx/src/controllers/dlgprefcontroller.cpp (+168/-0) mixxx/src/controllers/dlgprefcontroller.h (+67/-0) mixxx/src/controllers/dlgprefcontrollerdlg.ui (+140/-0) mixxx/src/controllers/dlgprefnocontrollers.cpp (+25/-0) mixxx/src/controllers/dlgprefnocontrollers.h (+33/-0) mixxx/src/controllers/dlgprefnocontrollersdlg.ui (+46/-0) mixxx/src/controllers/hidcontroller.cpp (+249/-0) mixxx/src/controllers/hidcontroller.h (+75/-0) mixxx/src/controllers/hidenumerator.cpp (+59/-0) mixxx/src/controllers/hidenumerator.h (+31/-0) mixxx/src/controllers/midi/hss1394controller.cpp (+211/-0) mixxx/src/controllers/midi/hss1394controller.h (+66/-0) mixxx/src/controllers/midi/hss1394enumerator.cpp (+60/-0) mixxx/src/controllers/midi/hss1394enumerator.h (+31/-0) mixxx/src/controllers/midi/midicontroller-preset.cpp (+468/-0) mixxx/src/controllers/midi/midicontroller.cpp (+404/-0) mixxx/src/controllers/midi/midicontroller.h (+91/-0) mixxx/src/controllers/midi/midienumerator.cpp (+24/-0) mixxx/src/controllers/midi/midienumerator.h (+37/-0) mixxx/src/controllers/midi/midimessage.h (+89/-0) mixxx/src/controllers/midi/midioutputhandler.cpp (+74/-0) mixxx/src/controllers/midi/midioutputhandler.h (+51/-0) mixxx/src/controllers/midi/portmidicontroller.cpp (+245/-0) mixxx/src/controllers/midi/portmidicontroller.h (+67/-0) mixxx/src/controllers/midi/portmidienumerator.cpp (+133/-0) mixxx/src/controllers/midi/portmidienumerator.h (+32/-0) mixxx/src/controllers/qtscript-bytearray/bytearrayclass.cpp (+284/-0) mixxx/src/controllers/qtscript-bytearray/bytearrayclass.h (+91/-0) mixxx/src/controllers/qtscript-bytearray/bytearrayprototype.cpp (+129/-0) mixxx/src/controllers/qtscript-bytearray/bytearrayprototype.h (+76/-0) mixxx/src/controllogpotmeter.cpp (+2/-1) mixxx/src/controllogpotmeter.h (+1/-1) mixxx/src/controlobject.cpp (+6/-8) mixxx/src/controlobject.h (+4/-4) mixxx/src/controlobjectthread.cpp (+2/-1) mixxx/src/controlobjectthread.h (+3/-3) mixxx/src/controlpotmeter.cpp (+2/-1) mixxx/src/controlpotmeter.h (+1/-1) mixxx/src/controlpushbutton.cpp (+4/-4) mixxx/src/controlpushbutton.h (+2/-1) mixxx/src/controlttrotary.cpp (+2/-1) mixxx/src/controlttrotary.h (+2/-2) mixxx/src/controlvaluedelegate.cpp (+1/-1) mixxx/src/dlgmidilearning.cpp (+0/-210) mixxx/src/dlgmidilearning.h (+0/-56) mixxx/src/dlgmidilearning.ui (+0/-241) mixxx/src/dlgpreferences.cpp (+160/-31) mixxx/src/dlgpreferences.h (+28/-21) mixxx/src/dlgprefmidibindings.cpp (+0/-508) mixxx/src/dlgprefmidibindings.h (+0/-92) mixxx/src/dlgprefmidibindingsdlg.ui (+0/-324) mixxx/src/dlgprefnomidi.cpp (+0/-25) mixxx/src/dlgprefnomidi.h (+0/-33) mixxx/src/dlgprefnomididlg.ui (+0/-46) mixxx/src/engine/ratecontrol.cpp (+2/-0) mixxx/src/library/schemamanager.cpp (+2/-2) mixxx/src/main.cpp (+2/-2) mixxx/src/midi/hss1394enumerator.cpp (+0/-66) mixxx/src/midi/hss1394enumerator.h (+0/-38) mixxx/src/midi/midichanneldelegate.cpp (+0/-77) mixxx/src/midi/midichanneldelegate.h (+0/-36) mixxx/src/midi/mididevice.cpp (+0/-373) mixxx/src/midi/mididevice.h (+0/-115) mixxx/src/midi/mididevicedummy.h (+0/-42) mixxx/src/midi/midideviceenumerator.cpp (+0/-28) mixxx/src/midi/midideviceenumerator.h (+0/-38) mixxx/src/midi/mididevicehss1394.cpp (+0/-233) mixxx/src/midi/mididevicehss1394.h (+0/-66) mixxx/src/midi/mididevicemanager.cpp (+0/-217) mixxx/src/midi/mididevicemanager.h (+0/-54) mixxx/src/midi/midideviceportmidi.cpp (+0/-325) mixxx/src/midi/midideviceportmidi.h (+0/-60) mixxx/src/midi/midiinputmapping.h (+0/-10) mixxx/src/midi/midiinputmappingtablemodel.cpp (+0/-229) mixxx/src/midi/midiinputmappingtablemodel.h (+0/-42) mixxx/src/midi/midiledhandler.cpp (+0/-119) mixxx/src/midi/midiledhandler.h (+0/-44) mixxx/src/midi/midimapping.cpp (+0/-1178) mixxx/src/midi/midimapping.h (+0/-175) mixxx/src/midi/midimessage.cpp (+0/-111) mixxx/src/midi/midimessage.h (+0/-114) mixxx/src/midi/midinodelegate.cpp (+0/-75) mixxx/src/midi/midinodelegate.h (+0/-36) mixxx/src/midi/midioptiondelegate.cpp (+0/-158) mixxx/src/midi/midioptiondelegate.h (+0/-39) mixxx/src/midi/midioutputmapping.h (+0/-10) mixxx/src/midi/midioutputmappingtablemodel.cpp (+0/-263) mixxx/src/midi/midioutputmappingtablemodel.h (+0/-44) mixxx/src/midi/midiscriptengine.cpp (+0/-1342) mixxx/src/midi/midiscriptengine.h (+0/-145) mixxx/src/midi/midistatusdelegate.cpp (+0/-121) mixxx/src/midi/midistatusdelegate.h (+0/-39) mixxx/src/midi/portmidienumerator.cpp (+0/-135) mixxx/src/midi/portmidienumerator.h (+0/-37) mixxx/src/mixxx.cpp (+27/-25) mixxx/src/mixxx.h (+2/-3) mixxx/src/mixxx.rc (+2/-2) mixxx/src/mixxxkeyboard.cpp (+2/-2) mixxx/src/recording/recordingmanager.cpp (+1/-0) mixxx/src/skin/propertybinder.cpp (+2/-0) mixxx/src/softtakeover.cpp (+2/-2) mixxx/src/softtakeover.h (+1/-1) mixxx/src/test/controllerengine_test.cpp (+104/-25) mixxx/src/widget/wwidget.cpp (+0/-20) mixxx/src/widget/wwidget.h (+0/-2) mixxx/src/xmlparse.cpp (+23/-0) mixxx/src/xmlparse.h (+2/-0) |
||||||||
To merge this branch: | bzr merge lp://qastaging/~mixxxdevelopers/mixxx/features_controllerAbstraction | ||||||||
Related bugs: |
|
||||||||
Related blueprints: |
Direct HID controller support
(Medium)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
RJ Skerry-Ryan | Needs Fixing | ||
Review via email:
|
This proposal has been superseded by a proposal from 2012-04-07.
Commit message
Abstracts the controller subsystem to support multiple protocols. MIDI subsystem partially rewritten, directories, classes and threads reorganized. Adds full HID controller support. Removes MIDI mapping GUI for now.
To post a comment you must log in.
Maybe I missed the discussion on this but while I agree that the GUI mapping support totally sucks do we really want to remove it without replacing it?