projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert
[ardour.git]
/
libs
/
ardour
/
session_handle.cc
diff --git
a/libs/ardour/session_handle.cc
b/libs/ardour/session_handle.cc
index 36515505ac52ee40ca191ef8557d2f033fce9a46..e9284b7c9849e431936253a043edff1f5cab61a5 100644
(file)
--- a/
libs/ardour/session_handle.cc
+++ b/
libs/ardour/session_handle.cc
@@
-17,7
+17,9
@@
*/
*/
+#include "pbd/demangle.h"
#include "pbd/error.h"
#include "pbd/error.h"
+#include "pbd/boost_debug.h"
#include "ardour/session.h"
#include "ardour/session_handle.h"
#include "ardour/session.h"
#include "ardour/session_handle.h"
@@
-29,12
+31,12
@@
using namespace ARDOUR;
using namespace PBD;
SessionHandlePtr::SessionHandlePtr (Session* s)
using namespace PBD;
SessionHandlePtr::SessionHandlePtr (Session* s)
- : _session (s)
+ : _session (s)
{
if (_session) {
_session->DropReferences.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
}
{
if (_session) {
_session->DropReferences.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
}
-}
+}
void
SessionHandlePtr::set_session (Session* s)
void
SessionHandlePtr::set_session (Session* s)
@@
-61,11
+63,15
@@
SessionHandlePtr::session_going_away ()
SessionHandleRef::SessionHandleRef (Session& s)
SessionHandleRef::SessionHandleRef (Session& s)
- : _session (s)
+ : _session (s)
{
_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));
{
_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 ()
void
SessionHandleRef::session_going_away ()
@@
-77,5
+83,9
@@
SessionHandleRef::session_going_away ()
void
SessionHandleRef::insanity_check ()
{
void
SessionHandleRef::insanity_check ()
{
- cerr << string_compose (_("programming error: %1"), "SessionHandleRef exists across sesssion deletion!") << endl;
+ cerr << string_compose (
+ _("programming error: %1"),
+ string_compose("SessionHandleRef exists across session deletion! Dynamic type: %1 @ %2",
+ PBD::demangled_name (*this), this))
+ << endl;
}
}