Merge lp://qastaging/~daschuer/mixxx/autodj into lp://qastaging/~mixxxdevelopers/mixxx/trunk
Status: | Merged | ||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 2989 | ||||||||||||||||||||||||||||
Proposed branch: | lp://qastaging/~daschuer/mixxx/autodj | ||||||||||||||||||||||||||||
Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk | ||||||||||||||||||||||||||||
Diff against target: |
1979 lines (+1168/-231) 22 files modified
mixxx/build/depends.py (+24/-4) mixxx/lib/soundtouch-1.6.0/STTypes.h (+1/-1) mixxx/res/images/autodj/bottom.svg (+137/-0) mixxx/res/images/autodj/media-playlist-shuffle.svg (+214/-0) mixxx/res/images/autodj/stock_mail-send-receive.svg (+87/-0) mixxx/res/mixxx.qrc (+3/-0) mixxx/src/dlgautodj.cpp (+433/-161) mixxx/src/dlgautodj.h (+26/-2) mixxx/src/dlgautodj.ui (+110/-18) mixxx/src/library/autodjfeature.cpp (+30/-24) mixxx/src/library/autodjfeature.h (+2/-0) mixxx/src/library/browse/browsefeature.cpp (+14/-4) mixxx/src/library/browse/browsetablemodel.cpp (+8/-8) 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/playlistfeature.cpp (+23/-3) mixxx/src/library/playlistfeature.h (+3/-0) mixxx/src/library/playlisttablemodel.cpp (+11/-0) mixxx/src/library/playlisttablemodel.h (+1/-0) mixxx/src/widget/wtracktableview.cpp (+22/-2) mixxx/src/widget/wtracktableview.h (+3/-0) |
||||||||||||||||||||||||||||
To merge this branch: | bzr merge lp://qastaging/~daschuer/mixxx/autodj | ||||||||||||||||||||||||||||
Related bugs: |
|
||||||||||||||||||||||||||||
Related blueprints: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mixxx Development Team | Pending | ||
Review via email:
|
Description of the change
I have done some changes, which makes auto DJ useful for manual control.
* Manually to a deck loaded song is played by auto DJ
* Additional "Skip Next" Button
* Auto DJ did not change the "Repeat" Button any more
* "Repeat" works as desired (it temporary disables auto DJ)
* Lock fading of the two decks against each other, plus some other possible exceptions
* Enabling auto DJ always starts playback (we may discuss if it is desired)
* Next track is loaded immediately after fading (see bug 766817) also good to monitor what happens next in case browsing thou the library
* Additional "Fade Now" button (see bug 730577)
* "Fade Now" disables "Repeat"
* Track is deleted from the auto DJ list when it starts to play
* Image Buttons (fits to Outline-
* "Add to Auto DJ Queue" from Rhythmbox and Browser
* "Add to Auto DJ Top 2" for playing a song after next
* Autoscroll Patch
Tested r2801 of your autodj branch
* SKIP NEXT button
Does not work as expected. Play-count of the next track in queue is raised by one, but track is not skipped.
* CUSTOM TRANSITION TIME stepper
Changes to the transition time are not instantly effective for the transition from the currently playing track to the next queued track (same for the FADE NOW button). One would expect it works instantly when changed. Nonetheless it works for the next transition.
Furthermore i think the preference dialog is not an optimal place for the stepper. It should go from the preferences directly to the AutoDJ tab in the library widget. This would improve usability and allow easy in-session changes.