try not thinning when loading old-school automation lists

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

diff --git a/libs/ardour/named_selection.cc b/libs/ardour/named_selection.cc
index 56e4252ab92818639411541f0aa2c8cb1d8a2561..4bcc3f3b726da25f3e9b0dd9d43aa17a7488716a 100644 (file)
--- a/libs/ardour/named_selection.cc
+++ b/libs/ardour/named_selection.cc
@@ -24,6 +24,7 @@
 #include "ardour/utils.h"
 #include "ardour/playlist.h"
 #include "ardour/named_selection.h"
+#include "ardour/session_playlists.h"
 
 #include "i18n.h"
 
@@ -31,7 +32,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-sigc::signal<void,NamedSelection*> NamedSelection::NamedSelectionCreated;
+PBD::Signal1<void,NamedSelection*> NamedSelection::NamedSelectionCreated;
 
 typedef std::list<boost::shared_ptr<Playlist> > PlaylistList;
 
@@ -51,8 +52,6 @@ NamedSelection::NamedSelection (string n, PlaylistList& l)
                (*i)->set_name (new_name);
                (*i)->use();
        }
-
-       NamedSelectionCreated (this);
 }
 
 NamedSelection::NamedSelection (Session& session, const XMLNode& node)
@@ -82,7 +81,7 @@ NamedSelection::NamedSelection (Session& session, const XMLNode& node)
                plnode = *niter;
 
                if ((property = plnode->property ("name")) != 0) {
-                       if ((playlist = session.playlists.by_name (property->value())) != 0) {
+                       if ((playlist = session.playlists->by_name (property->value())) != 0) {
                                playlist->use();
                                playlists.push_back (playlist);
                        } else {
@@ -100,8 +99,9 @@ NamedSelection::NamedSelection (Session& session, const XMLNode& node)
 NamedSelection::~NamedSelection ()
 {
        for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+               /* XXX who really owns these? us or the session? */
+               (*i)->drop_references ();
                (*i)->release ();
-               (*i)->GoingAway ();
        }
 }