Merge lp://qastaging/~jwc/mixxx/features_trackloadoverride into lp://qastaging/~mixxxdevelopers/mixxx/trunk

Proposed by JWC
Status: Merged
Merged at revision: 2742
Proposed branch: lp://qastaging/~jwc/mixxx/features_trackloadoverride
Merge into: lp://qastaging/~mixxxdevelopers/mixxx/trunk
Diff against target: 87 lines (+32/-4)
4 files modified
mixxx/src/dlgprefcontrols.cpp (+13/-0)
mixxx/src/dlgprefcontrols.h (+1/-0)
mixxx/src/dlgprefcontrolsdlg.ui (+10/-0)
mixxx/src/widget/wtracktableview.cpp (+8/-4)
To merge this branch: bzr merge lp://qastaging/~jwc/mixxx/features_trackloadoverride
Reviewer Review Type Date Requested Status
RJ Skerry-Ryan Approve
Review via email: mp+56414@code.qastaging.launchpad.net

Description of the change

Adds a preference option that allows the user to turn on or off the ability to load a track into a playing deck. By default, this feature is disabled (which is the current method of operation -- Mixxx won't let you load tracks into playing decks).

This does not enable the "Load into Deck x" context menu options. I believe that those are very dangerous to enable for a playing track because it's easy for your mouse to slip. Instead, it enables the ability to load into decks by pressing keyboard shortcuts ( [ and ] ) or through your controller.

This feature is especially useful for vinyl control users.

To post a comment you must log in.
2723. By JWC

Change TrackLoad -> AllowTrackLoadToPlayingDeck everywhere to be a little more verbose.

Revision history for this message
RJ Skerry-Ryan (rryan) wrote :

Looks good, thanks JWC!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches