lp:~mixxxdevelopers/mixxx/tree_item_browser

Branch merges

Propose for merging

No branches dependent on this one.

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

RJ Skerry-Ryan: Approve on 2011-03-28

Diff: 1262 lines (+452/-121)

36 files modified

mixxx/src/dlgprefplaylist.cpp (+4/-0)
mixxx/src/dlgprefplaylistdlg.ui (+7/-0)
mixxx/src/library/autodjfeature.cpp (+3/-0)
mixxx/src/library/autodjfeature.h (+1/-0)
mixxx/src/library/browse/browsefeature.cpp (+21/-10)
mixxx/src/library/browse/browsefeature.h (+3/-1)
mixxx/src/library/browse/browsetablemodel.cpp (+33/-25)
mixxx/src/library/browse/browsetablemodel.h (+40/-34)
mixxx/src/library/browse/browsethread.cpp (+76/-30)
mixxx/src/library/browse/browsethread.h (+28/-6)
mixxx/src/library/cratefeature.cpp (+46/-3)
mixxx/src/library/cratefeature.h (+6/-1)
mixxx/src/library/itunes/itunesfeature.cpp (+3/-1)
mixxx/src/library/itunes/itunesfeature.h (+1/-0)
mixxx/src/library/library.cpp (+3/-3)
mixxx/src/library/libraryfeature.h (+11/-0)
mixxx/src/library/mixxxlibraryfeature.cpp (+2/-0)
mixxx/src/library/mixxxlibraryfeature.h (+1/-0)
mixxx/src/library/parser.cpp (+3/-0)
mixxx/src/library/parser.h (+1/-0)
mixxx/src/library/parserm3u.cpp (+34/-0)
mixxx/src/library/parserm3u.h (+3/-0)
mixxx/src/library/parserpls.cpp (+31/-0)
mixxx/src/library/parserpls.h (+2/-0)
mixxx/src/library/playlistfeature.cpp (+46/-2)
mixxx/src/library/playlistfeature.h (+6/-1)
mixxx/src/library/preparefeature.cpp (+5/-0)
mixxx/src/library/preparefeature.h (+1/-0)
mixxx/src/library/promotracksfeature.cpp (+3/-0)
mixxx/src/library/promotracksfeature.h (+1/-0)
mixxx/src/library/rhythmbox/rhythmboxfeature.cpp (+3/-1)
mixxx/src/library/rhythmbox/rhythmboxfeature.h (+1/-0)
mixxx/src/library/sidebarmodel.cpp (+18/-3)
mixxx/src/library/sidebarmodel.h (+1/-0)
mixxx/src/library/traktor/traktorfeature.cpp (+3/-0)
mixxx/src/library/traktor/traktorfeature.h (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #672778: Export Playlists to M3U with relative paths

Wishlist

Fix Released

Link a bug report

Related blueprints

2681. By Raffitea on 2011-03-28

Renamed context menu entry for crate export/import; If file extension is missing, append .m3u to the export file and continue to export in m3u; Replaced Qt::BlockingQueuedConnection with QueuedConnection, which seems to work for rapid sidebar folder iterations with keyboard/MIDI; Added a global static member for BrowseThread::getInstance().

2680. By Raffitea on 2011-03-28

Merging from trunk

2679. By Raffitea on 2011-03-27

Merging from trunk to get auto-expand feature

2678. By Raffitea on 2011-03-27

Now made BrowseThread singleton. BrowseTableModel objects will only process received signals if they have asked the thread to do so.

2677. By Raffitea on 2011-03-27

Removed the singleton character of BrowseTableModel. This was a really stupid idea....

2676. By Raffitea on 2011-03-27

Merging from trunk

2675. By Raffitea on 2011-03-26

Merging from trunk

2674. By Raffitea on 2011-03-26

Merging from trunk to get PrepareFeature fixes

2673. By Raffitea on 2011-03-26

made BrowseTableModel singleton because the recording feature will use the BrowseTableModel to display contents of a special recording directory. This approach avoids two BrowseThreads. If I had made BrowseThread singleton there would be two BrowseTableModel objects and both would populate when the Thread is active. This is not performant

2672. By Tobias <Tobias@Silverstar> on 2011-03-25

Merging from trunk to get library caching fixes