lp:~mixxxdevelopers/mixxx/features_direct_bind

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~mixxxdevelopers/mixxx/trunk at revision 3214

RJ Skerry-Ryan: Needs Fixing on 2012-05-11

Diff: 1162 lines (+598/-199)

8 files modified

mixxx/src/controllers/controller.cpp (+15/-14)
mixxx/src/controllers/controller.h (+2/-1)
mixxx/src/controllers/controllerengine.cpp (+321/-170)
mixxx/src/controllers/controllerengine.h (+61/-11)
mixxx/src/controllers/midi/midicontroller.cpp (+5/-2)
mixxx/src/controllers/mixxxcontrol.cpp (+7/-0)
mixxx/src/controllers/mixxxcontrol.h (+9/-0)
mixxx/src/test/controllerengine_test.cpp (+178/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2887. By madjester <madjester@voidwalker> on 2012-05-25

FIX: only check if the object is a function right before returning it in ControllerEngine::resolveFunction.

2886. By madjester <madjester@voidwalker> on 2012-05-25

Remove m_scriptBindings and bindScriptFunctions() from controllers and use ControllerEngine::resolveFunction to resolve functions (no more caching in the controllers themselves).

2885. By madjester <madjester@voidwalker> on 2012-05-25

Remove redundant assignment of cb.key in ControllerEngine::connectControl.

2884. By madjester <madjester@voidwalker> on 2012-05-25

Change occurances of MidiScriptEngine to ControllerEngine.

2883. By madjester <madjester@voidwalker> on 2012-05-25

FIX: return false in ControllerEngine::internalExecute(QScriptValue thisObject, QScriptValue functionObject) if functionObject is not an object to match the calling convention of the other overloads.

2882. By madjester <madjester@voidwalker> on 2012-05-25

FIX: check if object.isFunction in ControllerEngine::resolveFunction.

2881. By madjester <madjester@voidwalker> on 2012-05-25

FIX: check isFunction in ControllerEngine::callFunctionOnObjects before calling a QScriptValue.

2880. By madjester <madjester@voidwalker> on 2012-05-25

merge from trunk.

2879. By madjester <madjester@voidwalker> on 2012-05-09

merge from trunk.

2878. By madjester <madjester@voidwalker> on 2012-05-09

merge from trunk.