Mixxx

Merge lp://qastaging/~ezod/mixxx/hamster into lp://qastaging/~mixxxdevelopers/mixxx/trunk

hamster
Merge into trunk

Proposed by Aaron Mavrinac on 2012-08-18

Status:

Merged

Approved by:

RJ Skerry-Ryan on 2012-09-06

Approved revision:

3293

Merged at revision:

3296

Proposed branch:

lp://qastaging/~ezod/mixxx/hamster

Merge into:

lp://qastaging/~mixxxdevelopers/mixxx/trunk

Diff against target:

246 lines (+51/-26)

8 files modified

mixxx/src/dlgprefcrossfader.cpp (+21/-20)
mixxx/src/dlgprefcrossfader.h (+1/-0)
mixxx/src/dlgprefcrossfaderdlg.ui (+13/-0)
mixxx/src/engine/enginemaster.cpp (+6/-2)
mixxx/src/engine/enginemaster.h (+1/-1)
mixxx/src/engine/enginexfader.cpp (+7/-1)
mixxx/src/engine/enginexfader.h (+1/-1)
mixxx/src/playerinfo.cpp (+1/-1)

To merge this branch:

bzr merge lp://qastaging/~ezod/mixxx/hamster

Wishlist

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Daniel Schürmann		Needs Fixing on 2012-09-09
RJ Skerry-Ryan	2012-08-18	Approve on 2012-09-06
Review via email: mp+120268@code.qastaging.launchpad.net

Commit message

Add an option to reverse the crossfader (bug #829533) and fix crossfader config loading.

Description of the change

Add an option to reverse the crossfader (bug #829533) and fix crossfader config loading.

Revision history for this message

RJ Skerry-Ryan (rryan) wrote on 2012-09-06:

Thanks for the feature, Aaron. I've merged it into our 1.11 branch and it will be released in Mixxx 1.11.0. It seems you've also fixed the bug where the crossfader mode was not saved across Mixxx reboots. Sorry it took so long to review. Can I credit you as "Aaron Mavrinac"?

Finally, please sign the Mixxx contributor agreement to give us permission to distribute your changes under Mixxx's license:

https://docs.google.com/a/mixxx.org/spreadsheet/viewform?formkey=dEpYN2NkVEFnWWQzbkFfM0ZYYUZ5X2c6MQ#gid=0

Thanks again!
RJ Ryan

review: Approve

Revision history for this message

Aaron Mavrinac (ezod) wrote on 2012-09-07:

Yes, "Aaron Mavrinac" works. I've signed the contributor agreement. Thanks!

Revision history for this message

Daniel Schürmann (daschuer) wrote on 2012-09-09:

Hi RJ, Hi Aaron,

Aaron thank you for the good work on this.

I had started a review some time a go but I was not ready for writing a commend. Now here it is, a little late.

I like the patch, but it breaks Auto DJ! A quick solution is to issue a warning about this because hamster style is somehow unusal.

The best solution would be if we implement a "Xfader Controller" with controlls all Xfader input sources and calculates a single Xfader output value, which is used in the we need separate controls for the xfader.
We have discussed something similar in the AutoDJ GSOC project, but this was not started yet.

With a Xfader Controller, it would be possible to solve some other issues with the Xfader.
* Xfader gain is mostly constant but it is fresh calculated every process cycle.
* calibration is only needed for a controller crossfader, not for the GUI Crossfader
* Interaction between AutoDJ, GUI Crossfader and Hardware Crossfader need to be polished

I am not sure if the reverse happens on the right place in the XfadeGains calculation. If we ever use an unsymetric fade curve, controled by auto DJ, whe should apply the reverse just after the calibration and before calculating the Xfader curve.

I will also write a bug a reminder.

Kind regards,

Daniel

review: Needs Fixing