Mixxx

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

spinback_brake
Merge into trunk

Proposed by Zestoi on 2012-05-26

Status:	Merged
Merged at revision:	3212
Proposed branch:	lp://qastaging/~zestoi/mixxx/spinback_brake
Merge into:	lp://qastaging/~mixxxdevelopers/mixxx/trunk
Diff against target:	188 lines (+104/-11) 2 files modified mixxx/src/controllers/controllerengine.cpp (+99/-8) mixxx/src/controllers/controllerengine.h (+5/-3)
To merge this branch:	bzr merge lp://qastaging/~zestoi/mixxx/spinback_brake
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
RJ Skerry-Ryan		2012-05-26	Approve on 2012-05-26
Review via email: mp+107526@code.qastaging.launchpad.net

Description of the change

implements a spinback/brake effect in the engine

new function: ControllerEngine::brake() to enable/disable the effect

modified function: ControllerEngine::scratchProcess()

* m_rampFactor[deck] variable instead of 0.0001 constant
* extra logic to work out when the scratch timer can be disabled
* m_brakeActive[deck] to store whether we are in this effect or normal scratching mode
* m_brakeKeylock[deck] to store the keylock status so we can disable for the effect and re-enable afterwards if we need to

Revision history for this message