X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_playlists.cc;h=d7780ea9b545be76e9ce867eb9167d78df3fbe3b;hb=3c25d26e91d4703ba76c90d5175aa94e4ddd850b;hp=c2e0461546ec06332b336db7d2c347af21578805;hpb=54d5f36311d041ce3d5fa3e6ed14fde30bcb70b7;p=ardour.git

diff --git a/libs/ardour/session_playlists.cc b/libs/ardour/session_playlists.cc
index c2e0461546..d7780ea9b5 100644
--- a/libs/ardour/session_playlists.cc
+++ b/libs/ardour/session_playlists.cc
@@ -23,7 +23,7 @@
 #include "ardour/playlist_factory.h"
 #include "ardour/session_playlists.h"
 #include "ardour/track.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "pbd/compose.h"
 #include "pbd/xml++.h"
 
@@ -244,7 +244,6 @@ SessionPlaylists::destroy_region (boost::shared_ptr<Region> r)
 	}
 }
 
-
 void
 SessionPlaylists::find_equivalent_playlist_regions (boost::shared_ptr<Region> region, vector<boost::shared_ptr<Region> >& result)
 {
@@ -260,7 +259,10 @@ SessionPlaylists::source_use_count (boost::shared_ptr<const Source> src) const
 {
 	uint32_t count = 0;
 
-	cerr << "\t\tcheck " << playlists.size() << " playlists\n";
+	/* XXXX this can go wildly wrong in the presence of circular references
+	 * between compound regions.
+	 */
+
 	for (List::const_iterator p = playlists.begin(); p != playlists.end(); ++p) {
                 if ((*p)->uses_source (src)) {
                         ++count;
@@ -268,7 +270,6 @@ SessionPlaylists::source_use_count (boost::shared_ptr<const Source> src) const
                 }
 	}
 
-	cerr << "\t\tcheck " << playlists.size() << " unused playlists\n";
 	for (List::const_iterator p = unused_playlists.begin(); p != unused_playlists.end(); ++p) {
                 if ((*p)->uses_source (src)) {
                         ++count;
@@ -301,22 +302,53 @@ SessionPlaylists::update_after_tempo_map_change ()
 	}
 }
 
+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) {
@@ -495,7 +527,10 @@ SessionPlaylists::playlists_for_track (boost::shared_ptr<Track> tr) const
 	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);
 		}
 	}
@@ -504,7 +539,7 @@ SessionPlaylists::playlists_for_track (boost::shared_ptr<Track> tr) const
 }
 
 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++) {
@@ -512,10 +547,12 @@ SessionPlaylists::foreach (boost::function<void(boost::shared_ptr<const Playlist
 			functor (*i);
 		}
 	}
+	if (!incl_unused) {
+		return;
+	}
 	for (List::iterator i = unused_playlists.begin(); i != unused_playlists.end(); i++) {
 		if (!(*i)->hidden()) {
 			functor (*i);
 		}
 	}
 }
-