Use a shared_ptr for SessionPlaylists so that it can be explicitly destroyed in ...

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

diff --git a/libs/ardour/named_selection.cc b/libs/ardour/named_selection.cc
index ecce09692f20ccc8d7a224247688775ba46fd08e..5353d1e8243dcaf839479deda1750c2184d88ec9 100644 (file)
--- a/libs/ardour/named_selection.cc
+++ b/libs/ardour/named_selection.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003 Paul Davis 
+    Copyright (C) 2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,19 +15,20 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
-#include <pbd/failed_constructor.h>
-#include <pbd/error.h>
+#include "pbd/failed_constructor.h"
+#include "pbd/error.h"
 
-#include <ardour/session.h>
-#include <ardour/utils.h>
-#include <ardour/playlist.h>
-#include <ardour/named_selection.h>
+#include "ardour/session.h"
+#include "ardour/utils.h"
+#include "ardour/playlist.h"
+#include "ardour/named_selection.h"
+#include "ardour/session_playlists.h"
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
@@ -35,13 +36,23 @@ sigc::signal<void,NamedSelection*> NamedSelection::NamedSelectionCreated;
 
 typedef std::list<boost::shared_ptr<Playlist> > PlaylistList;
 
-NamedSelection::NamedSelection (string n, PlaylistList& l) 
+NamedSelection::NamedSelection (string n, PlaylistList& l)
        : name (n)
 {
        playlists = l;
        for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+               string new_name;
+
+               /* rename playlists to reflect our ownership */
+
+               new_name = name;
+               new_name += '/';
+               new_name += (*i)->name();
+
+               (*i)->set_name (new_name);
                (*i)->use();
        }
+
        NamedSelectionCreated (this);
 }
 
@@ -55,7 +66,7 @@ NamedSelection::NamedSelection (Session& session, const XMLNode& node)
        }
 
        name = property->value();
-       
+
        if ((lists_node = find_named_node (node, "Playlists")) == 0) {
                return;
        }
@@ -72,7 +83,7 @@ NamedSelection::NamedSelection (Session& session, const XMLNode& node)
                plnode = *niter;
 
                if ((property = plnode->property ("name")) != 0) {
-                       if ((playlist = session.playlist_by_name (property->value())) != 0) {
+                       if ((playlist = session.playlists->by_name (property->value())) != 0) {
                                playlist->use();
                                playlists.push_back (playlist);
                        } else {
@@ -90,12 +101,13 @@ NamedSelection::NamedSelection (Session& session, const XMLNode& node)
 NamedSelection::~NamedSelection ()
 {
        for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) {
-               (*i)->release();
+               (*i)->release ();
+               (*i)->GoingAway ();
        }
 }
 
 int
-NamedSelection::set_state (const XMLNode& node)
+NamedSelection::set_state (const XMLNode& /*node*/, int /*version*/)
 {
        return 0;
 }
@@ -115,6 +127,6 @@ NamedSelection::get_state ()
                plnode->add_property ("name", (*i)->name());
                child->add_child_nocopy (*plnode);
        }
-       
+
        return *root;
 }