Merge lp://qastaging/~daschuer/mixxx/1.10-autodj into lp://qastaging/mixxx/1.10

Proposed by Daniel Schürmann
Status: Merged
Merge reported by: Daniel Schürmann
Merged at revision: not available
Proposed branch: lp://qastaging/~daschuer/mixxx/1.10-autodj
Merge into: lp://qastaging/mixxx/1.10
Diff against target: 1731 lines (+680/-326)
31 files modified
mixxx/src/dlgautodj.cpp (+467/-233)
mixxx/src/dlgautodj.h (+32/-10)
mixxx/src/dlgprepare.h (+2/-0)
mixxx/src/dlgrecording.cpp (+1/-0)
mixxx/src/dlgrecording.h (+1/-0)
mixxx/src/library/autodjfeature.cpp (+31/-25)
mixxx/src/library/autodjfeature.h (+2/-0)
mixxx/src/library/basesqltablemodel.cpp (+2/-1)
mixxx/src/library/browse/browsefeature.cpp (+2/-1)
mixxx/src/library/browse/browsefeature.h (+0/-1)
mixxx/src/library/browse/browsetablemodel.cpp (+9/-9)
mixxx/src/library/cratefeature.cpp (+1/-0)
mixxx/src/library/dao/cratedao.h (+2/-0)
mixxx/src/library/dao/playlistdao.cpp (+11/-3)
mixxx/src/library/dao/playlistdao.h (+3/-1)
mixxx/src/library/itunes/itunesfeature.cpp (+2/-3)
mixxx/src/library/playlistfeature.cpp (+9/-2)
mixxx/src/library/playlistfeature.h (+1/-0)
mixxx/src/library/playlisttablemodel.cpp (+33/-11)
mixxx/src/library/playlisttablemodel.h (+2/-3)
mixxx/src/library/preparefeature.cpp (+16/-11)
mixxx/src/library/preparefeature.h (+2/-0)
mixxx/src/library/proxytrackmodel.cpp (+2/-1)
mixxx/src/library/recording/recordingfeature.cpp (+20/-5)
mixxx/src/library/recording/recordingfeature.h (+0/-1)
mixxx/src/library/rhythmbox/rhythmboxfeature.cpp (+1/-2)
mixxx/src/library/traktor/traktorfeature.cpp (+2/-2)
mixxx/src/soundmanager.h (+1/-1)
mixxx/src/widget/wsearchlineedit.cpp (+11/-0)
mixxx/src/widget/wtracktableview.cpp (+9/-0)
mixxx/src/widget/wtracktableview.h (+3/-0)
To merge this branch: bzr merge lp://qastaging/~daschuer/mixxx/1.10-autodj
Reviewer Review Type Date Requested Status
RJ Skerry-Ryan Approve
Review via email: mp+108245@code.qastaging.launchpad.net

Description of the change

Back port of the auto DJ patches, without the new controls.

To post a comment you must log in.
Revision history for this message
RJ Skerry-Ryan (rryan) wrote :

Looks good -- please merge!

review: Approve
Revision history for this message
Daniel Schürmann (daschuer) wrote :

Merged to #3107

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