Merged with trunk R1283.

NOTE: Compiles, but broken (crash on adding MIDI track).


git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 10 insertions, 8 deletions

diff --git a/libs/ardour/named_selection.cc b/libs/ardour/named_selection.cc
index 605d7cae13..ecce09692f 100644
--- a/libs/ardour/named_selection.cc
+++ b/libs/ardour/named_selection.cc
@@ -33,12 +33,14 @@ using namespace PBD;
 
 sigc::signal<void,NamedSelection*> NamedSelection::NamedSelectionCreated;
 
-NamedSelection::NamedSelection (string n, list<Playlist*>& l) 
+typedef std::list<boost::shared_ptr<Playlist> > PlaylistList;
+
+NamedSelection::NamedSelection (string n, PlaylistList& l) 
 	: name (n)
 {
 	playlists = l;
-	for (list<Playlist*>::iterator i = playlists.begin(); i != playlists.end(); ++i) {
-		(*i)->ref();
+	for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+		(*i)->use();
 	}
 	NamedSelectionCreated (this);
 }
@@ -65,13 +67,13 @@ NamedSelection::NamedSelection (Session& session, const XMLNode& node)
 
 		const XMLNode* plnode;
 		string playlist_name;
-		Playlist* playlist;
+		boost::shared_ptr<Playlist> playlist;
 
 		plnode = *niter;
 
 		if ((property = plnode->property ("name")) != 0) {
 			if ((playlist = session.playlist_by_name (property->value())) != 0) {
-				playlist->ref();
+				playlist->use();
 				playlists.push_back (playlist);
 			} else {
 				warning << string_compose (_("Chunk %1 uses an unknown playlist \"%2\""), name, property->value()) << endmsg;
@@ -87,8 +89,8 @@ NamedSelection::NamedSelection (Session& session, const XMLNode& node)
 
 NamedSelection::~NamedSelection ()
 {
-	for (list<Playlist*>::iterator i = playlists.begin(); i != playlists.end(); ++i) {
-		(*i)->unref();
+	for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+		(*i)->release();
 	}
 }
 
@@ -107,7 +109,7 @@ NamedSelection::get_state ()
 	root->add_property ("name", name);
 	child = root->add_child ("Playlists");
 
-	for (list<Playlist*>::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+	for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) {
 		XMLNode* plnode = new XMLNode ("Playlist");
 
 		plnode->add_property ("name", (*i)->name());