Merge lp://qastaging/~daschuer/mixxx/features_setlog into lp://qastaging/~mixxxdevelopers/mixxx/trunk
Proposed by
Daniel Schürmann
Status: | Merged | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 2990 | ||||||||||||||||||||
Proposed branch: | lp://qastaging/~daschuer/mixxx/features_setlog | ||||||||||||||||||||
Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk | ||||||||||||||||||||
Diff against target: |
2721 lines (+1490/-224) 32 files modified
mixxx/build/depends.py (+26/-4) mixxx/lib/soundtouch-1.6.0/STTypes.h (+1/-1) mixxx/res/html/setlogs.html (+10/-0) mixxx/res/mixxx.qrc (+3/-0) mixxx/src/basetrackplayer.cpp (+1/-1) mixxx/src/dlgautodj.cpp (+1/-1) mixxx/src/library/cratefeature.cpp (+106/-82) mixxx/src/library/cratefeature.h (+4/-1) mixxx/src/library/dao/cratedao.cpp (+5/-4) mixxx/src/library/dao/cratedao.h (+3/-1) mixxx/src/library/dao/playlistdao.cpp (+143/-29) mixxx/src/library/dao/playlistdao.h (+23/-5) mixxx/src/library/legacylibraryimporter.cpp (+1/-2) mixxx/src/library/library.cpp (+2/-0) mixxx/src/library/libraryfeature.h (+2/-1) mixxx/src/library/parser.cpp (+1/-1) mixxx/src/library/parsercsv.cpp (+238/-0) mixxx/src/library/parsercsv.h (+41/-0) mixxx/src/library/playlistfeature.cpp (+113/-57) mixxx/src/library/playlistfeature.h (+5/-1) mixxx/src/library/playlisttablemodel.cpp (+12/-0) mixxx/src/library/playlisttablemodel.h (+1/-0) mixxx/src/library/preparefeature.cpp (+13/-2) mixxx/src/library/setlogfeature.cpp (+571/-0) mixxx/src/library/setlogfeature.h (+93/-0) mixxx/src/library/sidebarmodel.cpp (+50/-26) mixxx/src/library/sidebarmodel.h (+1/-1) mixxx/src/library/trackcollection.cpp (+1/-1) mixxx/src/mixxx.cpp (+1/-1) mixxx/src/trackinfoobject.cpp (+11/-2) mixxx/src/trackinfoobject.h (+2/-0) mixxx/src/widget/wlibrarysidebar.cpp (+5/-0) |
||||||||||||||||||||
To merge this branch: | bzr merge lp://qastaging/~daschuer/mixxx/features_setlog | ||||||||||||||||||||
Related bugs: |
|
||||||||||||||||||||
Related blueprints: |
Library History Feature
(Medium)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mixxx Development Team | Pending | ||
Review via email: mp+78882@code.qastaging.launchpad.net |
Description of the change
This is an implementation of set log, a playlist filled with all the played songs from last DJ set.
Features:
* add a set log to Auto DJ
* export a setlog as m3u, m3u8, and pls playlist
* export a setlog as readable text and csv
* merge two set logs in case of mixxx restart
To post a comment you must log in.
Tested your branch and would like to few notes:
* In the treeview`s set log submenu sort from newest to oldest entry, currently it`s sorted from oldest to newest. The session that is currently running session should be on 1st position.
* The new icons (setlog & running session ) need some work, I can take care of it if you like.
* We had a small user survey about what format Mixxx users would like to generate session playlists in @ http:// mixxx.org/ forums/ viewtopic. php?f=1& t=2463& p=9265 , txt/csv got the most votes. Is it possible with reasonable effort to add txt/csv export to your branch? That would increase setlog`s usability for professional application (think GEMA/ASCAP/BMI set lists).
Thanks for all your work,
jus