lp:~daschuer/mixxx/features_setlog

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~mixxxdevelopers/mixxx/trunk at revision 2990

Mixxx Development Team: Pending requested 2011-10-10

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #661449: Library history feature	Wishlist	Fix Released
Bug #766814: Export set list	Wishlist	Fix Released
Bug #783634: played counter counting loads, not playes	Low	Fix Released
Bug #834006: selection jumps to root item after rename and change lock in playlist tree	Medium	Fix Released
Bug #892998: m3u text encoding issues	Medium	Fix Released

Link a bug report

Related blueprints

2859. By Daniel Schürmann on 2011-12-10

merged with lp:mixxx

2858. By Daniel Schürmann on 2011-12-01

export position in 01. format

2857. By Daniel Schürmann on 2011-11-30

Readable text export

2856. By Daniel Schürmann on 2011-11-22

csv und m3u8 import and export

2855. By Daniel Schürmann on 2011-11-06

merged with lp:mixxx

2854. By Daniel Schürmann on 2011-10-31

merged from lp:mixxx

2853. By Daniel Schürmann on 2011-10-22

merged with lp:mixxx

2852. By Daniel Schürmann on 2011-10-12

merged with lp:mixxx

2851. By Daniel Schürmann on 2011-10-10

scroll sidebar to selection after

2850. By Daniel Schürmann on 2011-10-09

* feature Join with previos now working
* Resore Played flags when joining setlogs
* setlog html page updated