diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-07 13:32:31 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-07 13:36:04 -0400 |
| commit | a232673454fa3583da22fdd55eea16200f90c438 (patch) | |
| tree | e4d89e7f21248ae621198ced12cad0667e176351 /libs/ardour/session_state.cc | |
| parent | 2f9d5077dcd82ad0ea09f342ebc1baf8dc68a68c (diff) | |
make boost shared_ptr debugging a little easier to turn on/off
Diffstat (limited to 'libs/ardour/session_state.cc')
| -rw-r--r-- | libs/ardour/session_state.cc | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 05cf89ff0a..7bc9dfdeeb 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -61,7 +61,6 @@ #include "evoral/SMF.hpp" -#include "pbd/boost_debug.h" #include "pbd/basename.h" #include "pbd/controllable_descriptor.h" #include "pbd/debug.h" @@ -83,6 +82,7 @@ #include "ardour/audiofilesource.h" #include "ardour/audioregion.h" #include "ardour/automation_control.h" +#include "ardour/boost_debug.h" #include "ardour/butler.h" #include "ardour/control_protocol_manager.h" #include "ardour/directory_names.h" @@ -637,10 +637,10 @@ Session::create (const string& session_template, BusProfile* bus_profile) if (r->init ()) { return -1; } -#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - // boost_debug_shared_ptr_mark_interesting (r.get(), "Route"); -#endif - { + + BOOST_MARK_ROUTE(r); + + { Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); r->input()->ensure_io (count, false, this); r->output()->ensure_io (count, false, this); @@ -1611,9 +1611,7 @@ Session::XMLRouteFactory (const XMLNode& node, int version) return ret; } -#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - // boost_debug_shared_ptr_mark_interesting (track.get(), "Track"); -#endif + BOOST_MARK_TRACK (track); ret = track; } else { @@ -1626,9 +1624,7 @@ Session::XMLRouteFactory (const XMLNode& node, int version) boost::shared_ptr<Route> r (new Route (*this, X_("toBeResetFroXML"), flags)); if (r->init () == 0 && r->set_state (node, version) == 0) { -#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - // boost_debug_shared_ptr_mark_interesting (r.get(), "Route"); -#endif + BOOST_MARK_ROUTE (r); ret = r; } } @@ -1689,9 +1685,7 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version) track->set_diskstream (*i); -#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - // boost_debug_shared_ptr_mark_interesting (track.get(), "Track"); -#endif + BOOST_MARK_TRACK (track); ret = track; } else { @@ -1704,9 +1698,7 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version) boost::shared_ptr<Route> r (new Route (*this, X_("toBeResetFroXML"), flags)); if (r->init () == 0 && r->set_state (node, version) == 0) { -#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - // boost_debug_shared_ptr_mark_interesting (r.get(), "Route"); -#endif + BOOST_MARK_ROUTE (r); ret = r; } } |