lp:~mixxxdevelopers/mixxx/features_controllerAbstraction
Created by
Sean M. Pappalardo
and last modified
The goal of this branch is to abstract the controller subsystem another level to support non-MIDI controllers.
- Get this branch:
- bzr branch lp:~mixxxdevelopers/mixxx/features_controllerAbstraction
Members of
Mixxx Development Team
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- RJ Skerry-Ryan: Approve
-
Diff: 24123 lines (+13054/-8821)171 files modifiedmixxx/SConstruct (+1/-1)
mixxx/build/depends.py (+26/-23)
mixxx/build/features.py (+47/-33)
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.midi.xml (+9/-2)
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 (+230/-234)
mixxx/src/controlbeat.cpp (+2/-1)
mixxx/src/controlbeat.h (+1/-2)
mixxx/src/controlgroupdelegate.cpp (+2/-1)
mixxx/src/controllers/controller.cpp (+144/-0)
mixxx/src/controllers/controller.h (+160/-0)
mixxx/src/controllers/controllerengine.cpp (+1157/-0)
mixxx/src/controllers/controllerengine.h (+127/-0)
mixxx/src/controllers/controllerenumerator.cpp (+18/-0)
mixxx/src/controllers/controllerenumerator.h (+33/-0)
mixxx/src/controllers/controllermanager.cpp (+359/-0)
mixxx/src/controllers/controllermanager.h (+75/-0)
mixxx/src/controllers/controllerpreset.h (+40/-0)
mixxx/src/controllers/controllerpresetfilehandler.cpp (+121/-0)
mixxx/src/controllers/controllerpresetfilehandler.h (+63/-0)
mixxx/src/controllers/controllerpresetvisitor.h (+14/-0)
mixxx/src/controllers/defs_controllers.h (+13/-0)
mixxx/src/controllers/dlgcontrollerlearning.cpp (+209/-0)
mixxx/src/controllers/dlgcontrollerlearning.h (+47/-0)
mixxx/src/controllers/dlgcontrollerlearning.ui (+242/-0)
mixxx/src/controllers/dlgprefcontroller.cpp (+139/-0)
mixxx/src/controllers/dlgprefcontroller.h (+70/-0)
mixxx/src/controllers/dlgprefcontrollerdlg.ui (+127/-0)
mixxx/src/controllers/dlgprefmappablecontroller.cpp (+110/-0)
mixxx/src/controllers/dlgprefmappablecontroller.h (+45/-0)
mixxx/src/controllers/dlgprefmappablecontrollerdlg.ui (+247/-0)
mixxx/src/controllers/dlgprefnocontrollers.cpp (+11/-0)
mixxx/src/controllers/dlgprefnocontrollers.h (+23/-0)
mixxx/src/controllers/dlgprefnocontrollersdlg.ui (+46/-0)
mixxx/src/controllers/hid/hidcontroller.cpp (+242/-0)
mixxx/src/controllers/hid/hidcontroller.h (+92/-0)
mixxx/src/controllers/hid/hidcontrollerpreset.h (+23/-0)
mixxx/src/controllers/hid/hidcontrollerpresetfilehandler.cpp (+16/-0)
mixxx/src/controllers/hid/hidcontrollerpresetfilehandler.h (+21/-0)
mixxx/src/controllers/hid/hidenumerator.cpp (+47/-0)
mixxx/src/controllers/hid/hidenumerator.h (+24/-0)
mixxx/src/controllers/midi/hss1394controller.cpp (+193/-0)
mixxx/src/controllers/midi/hss1394controller.h (+69/-0)
mixxx/src/controllers/midi/hss1394enumerator.cpp (+51/-0)
mixxx/src/controllers/midi/hss1394enumerator.h (+25/-0)
mixxx/src/controllers/midi/midicontroller.cpp (+500/-0)
mixxx/src/controllers/midi/midicontroller.h (+82/-0)
mixxx/src/controllers/midi/midicontrollerpreset.h (+42/-0)
mixxx/src/controllers/midi/midicontrollerpresetfilehandler.cpp (+465/-0)
mixxx/src/controllers/midi/midicontrollerpresetfilehandler.h (+37/-0)
mixxx/src/controllers/midi/midienumerator.cpp (+15/-0)
mixxx/src/controllers/midi/midienumerator.h (+26/-0)
mixxx/src/controllers/midi/midimessage.h (+89/-0)
mixxx/src/controllers/midi/midioutputhandler.cpp (+72/-0)
mixxx/src/controllers/midi/midioutputhandler.h (+46/-0)
mixxx/src/controllers/midi/portmidicontroller.cpp (+221/-0)
mixxx/src/controllers/midi/portmidicontroller.h (+66/-0)
mixxx/src/controllers/midi/portmidienumerator.cpp (+125/-0)
mixxx/src/controllers/midi/portmidienumerator.h (+25/-0)
mixxx/src/controllers/mixxxcontrol.cpp (+17/-171)
mixxx/src/controllers/mixxxcontrol.h (+38/-67)
mixxx/src/controllers/pitchfilter.h (+7/-16)
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/controllers/softtakeover.cpp (+57/-63)
mixxx/src/controllers/softtakeover.h (+23/-35)
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/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 (+92/-105)
mixxx/src/dlgpreferences.h (+16/-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 (+26/-23)
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/test/controllerengine_test.cpp (+104/-25)
mixxx/src/upgrade.cpp (+74/-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)
Related source package recipes
Related bugs
| Bug #686410: Make MIDI scratch drag toggleable | Wishlist | Fix Released |
|
| Bug #976977: Soft-takeover is a bit too aggressive, especially at the top and bottom of a control. | Low | Fix Released |
|
Related blueprints
Branch information
Recent revisions
- 2854. By RJ Skerry-Ryan
-
Sean -- please take a look at the comment I left. Not sure what the desired behavior is here.
- 2852. By RJ Skerry-Ryan
-
Make DlgPrefController not call open() or close() on controllers anymore. Switch HidReader to use QAtomicInt instead of bool flag.
- 2850. By RJ Skerry-Ryan
-
Add locking to protect m_controllers list in ControllerManager. Other misc cleanups.
- 2848. By RJ Skerry-Ryan
-
* Remove polling declaration from ControllerEnume
rator and put it in
the Controllers themselves.* Make all variables of Controller private and make sub-classes access
via accessors.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~mixxxdevelopers/mixxx/trunk
