Merge lp://qastaging/~mixxxdevelopers/mixxx/features_midiscript_improvements into lp://qastaging/~mixxxdevelopers/mixxx/trunk
Proposed by
Phillip Whelan
Status: | Rejected |
---|---|
Rejected by: | Phillip Whelan |
Proposed branch: | lp://qastaging/~mixxxdevelopers/mixxx/features_midiscript_improvements |
Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk |
Diff against target: |
16466 lines (+13595/-621) 120 files modified
.bzrignore (+4/-0) mixxx/SConstruct (+1/-1) mixxx/build/depends.py (+44/-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 (+14/-14) mixxx/res/controllers/DJTechTools MIDI Fighter.midi.xml (+1/-1) mixxx/res/controllers/EKS Otus.js (+95/-0) mixxx/res/controllers/Eks Otus.cntrlr.xml (+13/-0) mixxx/res/controllers/Stanton SCS.1m VUMETERS ONLY.xml (+979/-0) mixxx/res/controllers/Stanton-SCS1d-scripts.js (+85/-103) mixxx/res/controllers/Stanton-SCS3d-scripts.js (+4/-12) mixxx/res/controllers/common-controller-scripts.js (+50/-17) mixxx/res/mixxx.qrc (+1/-0) mixxx/src/SConscript (+12/-10) mixxx/src/controlbeat.cpp (+2/-1) mixxx/src/controlbeat.h (+1/-2) mixxx/src/controlgroupdelegate.cpp (+1/-1) mixxx/src/controllers/OLDmidi/dlgmidilearning.cpp (+2/-2) mixxx/src/controllers/OLDmidi/dlgmidilearning.h (+2/-2) mixxx/src/controllers/OLDmidi/dlgprefmidibindings.cpp (+13/-13) mixxx/src/controllers/OLDmidi/dlgprefmidibindings.h (+1/-1) mixxx/src/controllers/OLDmidi/dlgprefnomidi.h (+1/-1) mixxx/src/controllers/OLDmidi/mididevice.cpp (+2/-3) mixxx/src/controllers/OLDmidi/mididevice.h (+2/-1) mixxx/src/controllers/OLDmidi/mididevicemanager.cpp (+1/-1) mixxx/src/controllers/OLDmidi/midimapping.cpp (+193/-62) mixxx/src/controllers/OLDmidi/midimapping.h (+19/-4) mixxx/src/controllers/OLDmidi/midiscriptengine.cpp (+321/-155) mixxx/src/controllers/OLDmidi/midiscriptengine.h (+57/-8) mixxx/src/controllers/controller.cpp (+323/-0) mixxx/src/controllers/controller.h (+126/-0) mixxx/src/controllers/controllerengine.cpp (+1279/-0) mixxx/src/controllers/controllerengine.h (+186/-0) mixxx/src/controllers/controllerenumerator.cpp (+28/-0) mixxx/src/controllers/controllerenumerator.h (+36/-0) mixxx/src/controllers/controllermanager.cpp (+309/-0) mixxx/src/controllers/controllermanager.h (+108/-0) mixxx/src/controllers/defs_controllers.h (+24/-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 (+252/-0) mixxx/src/controllers/hidcontroller.h (+78/-0) mixxx/src/controllers/hidenumerator.cpp (+59/-0) mixxx/src/controllers/hidenumerator.h (+31/-0) mixxx/src/controllers/midi/hss1394controller.cpp (+214/-0) mixxx/src/controllers/midi/hss1394controller.h (+67/-0) mixxx/src/controllers/midi/hss1394enumerator.cpp (+60/-0) mixxx/src/controllers/midi/hss1394enumerator.h (+31/-0) mixxx/src/controllers/midi/midicontroller.cpp (+883/-0) mixxx/src/controllers/midi/midicontroller.h (+90/-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 (+246/-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 (+4/-7) mixxx/src/controlobject.h (+4/-4) 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/dlgpreferences.cpp (+160/-31) mixxx/src/dlgpreferences.h (+28/-21) mixxx/src/engine/ratecontrol.cpp (+2/-0) mixxx/src/library/schemamanager.cpp (+2/-2) mixxx/src/main.cpp (+3/-0) mixxx/src/mixxx.cpp (+38/-22) mixxx/src/mixxx.h (+4/-3) mixxx/src/mixxx.rc (+2/-2) mixxx/src/mixxxcontrol.cpp (+8/-0) mixxx/src/mixxxcontrol.h (+16/-1) 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/controllerenginetest.cpp (+198/-17) 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_midiscript_improvements |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
RJ Skerry-Ryan | Needs Fixing | ||
Review via email:
|
Description of the change
This brings many improvements all related to improving the usage of the QtScript API.
* Reload MIDI Script files when they are changed on disk
(very useful for development/
* Skip the parse phase for each MIDI Script call.
* Support for Closures (AKA Lambas & Anonymous Functions):
* engine.beginTimer: second argument can now be a function.
* engine.
because of how certain datatypes work there is now a new
To post a comment you must log in.
Just FYI, the MIDI subsystem has been completely gutted in features_ controllerAbtra ction. This branch should still merge fine with it, but the changes will end up in the OLDmidi/ directory, and applicable improvements will need to be manually migrated to the classes in the midi/ directory.