lp:~ulatekh/mixxx/auto-dj-crates

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:~mixxxdevelopers/mixxx/trunk

Daniel Schürmann: Needs Fixing on 2013-05-26

Diff: 2244 lines (+1765/-24)

27 files modified

mixxx/SConstruct (+1/-0)
mixxx/build/features.py (+22/-1)
mixxx/build/qtcreator/mixxx.pro (+18/-10)
mixxx/res/schema.xml (+8/-0)
mixxx/src/dlgautodj.cpp (+15/-0)
mixxx/src/dlgautodj.h (+2/-0)
mixxx/src/dlgautodj.ui (+7/-0)
mixxx/src/dlgprefcontrols.cpp (+63/-0)
mixxx/src/dlgprefcontrols.h (+3/-0)
mixxx/src/dlgprefcontrolsdlg.ui (+41/-1)
mixxx/src/library/autodjfeature.cpp (+266/-2)
mixxx/src/library/autodjfeature.h (+53/-1)
mixxx/src/library/baseplaylistfeature.cpp (+7/-2)
mixxx/src/library/baseplaylistfeature.h (+1/-0)
mixxx/src/library/cratefeature.cpp (+54/-2)
mixxx/src/library/cratefeature.h (+7/-0)
mixxx/src/library/dao/autodjcratesdao.cpp (+911/-0)
mixxx/src/library/dao/autodjcratesdao.h (+120/-0)
mixxx/src/library/dao/cratedao.cpp (+104/-1)
mixxx/src/library/dao/cratedao.h (+16/-1)
mixxx/src/library/dao/playlistdao.cpp (+1/-1)
mixxx/src/library/dao/playlistdao.h (+8/-1)
mixxx/src/library/dao/settingsdao.h (+7/-0)
mixxx/src/library/dao/trackdao.h (+2/-0)
mixxx/src/library/trackcollection.cpp (+1/-1)
mixxx/src/library/treeitemmodel.cpp (+25/-0)
mixxx/src/library/treeitemmodel.h (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3370. By Steven Boswell on 2013-06-09

Merged with lp:mixxx
Added one word to auto-DJ-crates preferences text

3369. By Steven Boswell on 2013-06-07

One more change to low-track situations in auto-DJ-crates.

3368. By Steven Boswell on 2013-06-06

Now auto-DJ-crates better handles situations where very few tracks are available.

3367. By Steven Boswell on 2013-06-05

Now random-tracks chosen by the auto-DJ-crates feature can be in terms of how recently the track was played.

3366. By Steven Boswell on 2013-06-05

Merged with lp:mixxx

3365. By Steven Boswell on 2013-06-03

One more menu item needed updating -- "Add crate" is now "Connect Crate to AutoDJ".

3364. By Steven Boswell on 2013-06-03

Changed "Add Crate to AutoDJ" to "Connect to AutoDJ", and "Remove Crate from AutoDJ" to "Disconnect from AutoDJ", and fixed curly-brace placement, per Daniel Schürmann's feedback.

3363. By Steven Boswell on 2013-05-16

Implemented an "Add crate" menu on the "Crates" tree-item in the "Auto DJ" feature.
One more convenient way to add a crate to the auto-DJ queue!

3362. By Steven Boswell on 2013-05-16

Made the auto-DJ-crates feature subject to conditional compilation.

3361. By Steven Boswell on 2013-05-16

Merged with lp:mixxx