cleanup up cleanup at session destruction; clarify the meaning of 3 signals (DropRefe...

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

diff --git a/libs/ardour/session_handle.cc b/libs/ardour/session_handle.cc
index 1cd78c8aac0d821b181d366123bcdef44b95682b..36515505ac52ee40ca191ef8557d2f033fce9a46 100644 (file)
--- a/libs/ardour/session_handle.cc
+++ b/libs/ardour/session_handle.cc
@@ -32,7 +32,7 @@ SessionHandlePtr::SessionHandlePtr (Session* s)
        : _session (s) 
 {
        if (_session) {
-               _session->GoingAway.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
+               _session->DropReferences.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
        }
 }      
 
@@ -47,7 +47,7 @@ SessionHandlePtr::set_session (Session* s)
 
        if (s) {
                _session = s;
-               _session->GoingAway.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
+               _session->DropReferences.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
        }
 }
 
@@ -63,11 +63,19 @@ SessionHandlePtr::session_going_away ()
 SessionHandleRef::SessionHandleRef (Session& s)
        : _session (s) 
 {
-       _session.GoingAway.connect_same_thread (*this, 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));
 }      
 
 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;
 }