2.X commits up to and including 7519

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

diff --git a/libs/ardour/session_playlists.cc b/libs/ardour/session_playlists.cc
index 2f8ae9a8f02cbbf3381aab856c0285a22800ce2b..38c6744d06c2864aef3b59f4ad83f584c009551c 100644 (file)
--- a/libs/ardour/session_playlists.cc
+++ b/libs/ardour/session_playlists.cc
@@ -219,6 +219,21 @@ SessionPlaylists::get (vector<boost::shared_ptr<Playlist> >& s)
        }
 }
 
+void
+SessionPlaylists::destroy_region (boost::shared_ptr<Region> r)
+{
+       Glib::Mutex::Lock lm (lock);
+
+       for (List::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+                (*i)->destroy_region (r);
+       }
+       
+       for (List::iterator i = unused_playlists.begin(); i != unused_playlists.end(); ++i) {
+                (*i)->destroy_region (r);
+       }
+}
+
+
 void
 SessionPlaylists::find_equivalent_playlist_regions (boost::shared_ptr<Region> region, vector<boost::shared_ptr<Region> >& result)
 {
@@ -262,14 +277,12 @@ 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 (!(*i)->empty()) {
-                               if (full_state) {
-                                       child->add_child_nocopy ((*i)->get_state());
-                               } else {
-                                       child->add_child_nocopy ((*i)->get_template());
-                               }
-                       }
-               }
+                        if (full_state) {
+                                child->add_child_nocopy ((*i)->get_state());
+                        } else {
+                                child->add_child_nocopy ((*i)->get_template());
+                        }
+                }
        }
 
        child = node->add_child ("UnusedPlaylists");