}
}
+namespace {
+struct id_compare
+{
+ bool operator()(const boost::shared_ptr<Playlist>& p1, const boost::shared_ptr<Playlist>& p2)
+ {
+ return p1->id () < p2->id ();
+ }
+};
+
+typedef std::set<boost::shared_ptr<Playlist> > List;
+typedef std::set<boost::shared_ptr<Playlist>, id_compare> IDSortedList;
+
+static void
+get_id_sorted_playlists (const List& playlists, IDSortedList& id_sorted_playlists)
+{
+ for (List::const_iterator i = playlists.begin(); i != playlists.end(); ++i) {
+ id_sorted_playlists.insert(*i);
+ }
+}
+
+} // anonymous namespace
+
void
SessionPlaylists::add_state (XMLNode* node, bool full_state)
{
XMLNode* child = node->add_child ("Playlists");
- for (List::iterator i = playlists.begin(); i != playlists.end(); ++i) {
- if (!(*i)->hidden()) {
- if (full_state) {
- child->add_child_nocopy ((*i)->get_state());
- } else {
- child->add_child_nocopy ((*i)->get_template());
- }
- }
+
+ IDSortedList id_sorted_playlists;
+ get_id_sorted_playlists (playlists, id_sorted_playlists);
+
+ for (IDSortedList::iterator i = id_sorted_playlists.begin (); i != id_sorted_playlists.end (); ++i) {
+ if (!(*i)->hidden ()) {
+ if (full_state) {
+ child->add_child_nocopy ((*i)->get_state ());
+ } else {
+ child->add_child_nocopy ((*i)->get_template ());
+ }
+ }
}
child = node->add_child ("UnusedPlaylists");
- for (List::iterator i = unused_playlists.begin(); i != unused_playlists.end(); ++i) {
+
+ IDSortedList id_sorted_unused_playlists;
+ get_id_sorted_playlists (unused_playlists, id_sorted_unused_playlists);
+
+ for (IDSortedList::iterator i = id_sorted_unused_playlists.begin ();
+ i != id_sorted_unused_playlists.end (); ++i) {
if (!(*i)->hidden()) {
if (!(*i)->empty()) {
if (full_state) {
vector<boost::shared_ptr<Playlist> > pl_tr;
for (vector<boost::shared_ptr<Playlist> >::iterator i = pl.begin(); i != pl.end(); ++i) {
- if (((*i)->get_orig_track_id() == tr->id()) || (tr->playlist()->id() == (*i)->id())) {
+ if ( ((*i)->get_orig_track_id() == tr->id()) ||
+ (tr->playlist()->id() == (*i)->id()) ||
+ ((*i)->shared_with (tr->id())) )
+ {
pl_tr.push_back (*i);
}
}
}
void
-SessionPlaylists::foreach (boost::function<void(boost::shared_ptr<const Playlist>)> functor)
+SessionPlaylists::foreach (boost::function<void(boost::shared_ptr<const Playlist>)> functor, bool incl_unused)
{
Glib::Threads::Mutex::Lock lm (lock);
for (List::iterator i = playlists.begin(); i != playlists.end(); i++) {
functor (*i);
}
}
+ if (!incl_unused) {
+ return;
+ }
for (List::iterator i = unused_playlists.begin(); i != unused_playlists.end(); i++) {
if (!(*i)->hidden()) {
functor (*i);