fix more cut-n-paste coding errors

[ardour.git] / libs / ardour / session_playlists.cc

diff --git a/libs/ardour/session_playlists.cc b/libs/ardour/session_playlists.cc
index ae846094d5def5bfa46d9b734973231745c6831a..50bc710347ab4935a7940437dd40455402f9e01c 100644 (file)
--- a/libs/ardour/session_playlists.cc
+++ b/libs/ardour/session_playlists.cc
@@ -325,36 +325,40 @@ get_id_sorted_playlists (const List& playlists, IDSortedList& id_sorted_playlist
 } // anonymous namespace
 
 void
-SessionPlaylists::add_state (XMLNode* node, bool full_state)
+SessionPlaylists::add_state (XMLNode* node, bool save_template, bool include_unused)
 {
        XMLNode* child = node->add_child ("Playlists");
 
        IDSortedList id_sorted_playlists;
        get_id_sorted_playlists (playlists, id_sorted_playlists);
 
-       for (List::iterator i = id_sorted_playlists.begin (); i != id_sorted_playlists.end (); ++i) {
+       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 {
+                       if (save_template) {
                                child->add_child_nocopy ((*i)->get_template ());
+                       } else {
+                               child->add_child_nocopy ((*i)->get_state ());
                        }
                }
        }
 
+       if (!include_unused) {
+               return;
+       }
+
        child = node->add_child ("UnusedPlaylists");
 
        IDSortedList id_sorted_unused_playlists;
        get_id_sorted_playlists (unused_playlists, id_sorted_unused_playlists);
 
-       for (List::iterator i = id_sorted_unused_playlists.begin ();
+       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) {
-                                       child->add_child_nocopy ((*i)->get_state());
-                               } else {
+                               if (save_template) {
                                        child->add_child_nocopy ((*i)->get_template());
+                               } else {
+                                       child->add_child_nocopy ((*i)->get_state());
                                }
                        }
                }
@@ -527,7 +531,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);
                }
        }