Mixxx

Merge lp://qastaging/~khyew/mixxx/fixes-1.9 into lp://qastaging/mixxx/1.9

fixes-1.9
Merge into release-1.9.x

Proposed by Qifan Xi on 2011-03-10

Status:

Merged

Approved by:

Albert Santoni on 2011-03-13

Approved revision:

2757

Merged at revision:

2762

Proposed branch:

lp://qastaging/~khyew/mixxx/fixes-1.9

Merge into:

lp://qastaging/mixxx/1.9

Diff against target:

177 lines (+69/-11)

3 files modified

mixxx/src/engine/cuecontrol.cpp (+51/-10)
mixxx/src/engine/cuecontrol.h (+4/-0)
mixxx/src/midi/mididevice.cpp (+14/-1)

To merge this branch:

bzr merge lp://qastaging/~khyew/mixxx/fixes-1.9

Related bugs:

Bug #309722: Holding Cue then pressing Play should continue track playback	Wishlist	Fix Released
Bug #714438: Song Position control via Pitch Bend steps are too large	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Santoni		2011-03-10	Approve on 2011-03-13
Review via email: mp+52937@code.qastaging.launchpad.net

Description of the change

fixes shit. I think I'm getting the hang of this Launchpad stuff finally.

Revision history for this message

Albert Santoni (gamegod) wrote on 2011-03-13:

Looks good, thanks Qifan!

review: Approve

Revision history for this message

Albert Santoni (gamegod) wrote on 2011-03-13:

Also - Tests good with the SCS.3d.

The cue+play behaviour is slightly different with the SCS.3d compared to the keyboard, but I don't think it's a big deal for now. At some point the custom .js that implements this cue+play feature for the SCS.3d should be removed, now that it's in the Mixxx core.

For the record, the current behaviours are:

SCS.3d - to get cue+play to continue the song, you must press both cue and play down, then release cue first. If you release play first, it will not continue the song upon releasing cue.

Keyboard - to get cue+play to continue the song, you just need to tap play while cue is depressed. It doesn't matter what order you release the keys in after that. (This is the better behaviour.)