ensure that imported regions have names based on the files they are based on

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

diff --git a/libs/ardour/session_handle.cc b/libs/ardour/session_handle.cc
index 03671cfa68f132f299c66e787c824e1cb6ee0a33..14ba994dc3e9ff83f4edb6c2b11a9fca1c254e33 100644 (file)
--- a/libs/ardour/session_handle.cc
+++ b/libs/ardour/session_handle.cc
@@ -18,6 +18,7 @@
 */
 
 #include "pbd/error.h"
+#include "pbd/boost_debug.h"
 
 #include "ardour/session.h"
 #include "ardour/session_handle.h"
@@ -32,7 +33,7 @@ SessionHandlePtr::SessionHandlePtr (Session* s)
        : _session (s) 
 {
        if (_session) {
-               _session_connections.add_connection (_session->GoingAway.connect (boost::bind (&SessionHandlePtr::session_going_away, this)));
+               _session->DropReferences.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
        }
 }      
 
@@ -47,7 +48,7 @@ SessionHandlePtr::set_session (Session* s)
 
        if (s) {
                _session = s;
-               _session_connections.add_connection (_session->GoingAway.connect (boost::bind (&SessionHandlePtr::session_going_away, this)));
+               _session->DropReferences.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
        }
 }
 
@@ -63,11 +64,23 @@ SessionHandlePtr::session_going_away ()
 SessionHandleRef::SessionHandleRef (Session& s)
        : _session (s) 
 {
-       scoped_connect (_session.GoingAway, boost::bind (&SessionHandleRef::session_going_away, this));
+       _session.DropReferences.connect_same_thread (*this, boost::bind (&SessionHandleRef::session_going_away, this));
+       _session.Destroyed.connect_same_thread (*this, boost::bind (&SessionHandleRef::insanity_check, this));
 }      
 
+SessionHandleRef::~SessionHandleRef ()
+{
+}
+
 void
 SessionHandleRef::session_going_away ()
 {
-       error << string_compose (_("programming error: %1"), "SessionHandleRef exists across sesssion deletion!") << endmsg;
+       /* a handleRef is allowed to exist at the time of DropReferences, but not at the time of Destroyed
+        */
+}
+
+void
+SessionHandleRef::insanity_check ()
+{
+       cerr << string_compose (_("programming error: %1"), "SessionHandleRef exists across sesssion deletion!") << endl;
 }