diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-10-29 15:52:38 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-10-29 15:52:38 +0000 |
commit | f871d665d59e3b95f9d47a80e5caead15d9a705b (patch) | |
tree | 65d974f6d179804d4c7c5292b24847ae7b9a4a3a /libs | |
parent | 70f4ee1b55bdbdc72955c4b813c8d627b116428a (diff) |
tweaks to boost debug related code, from a boost debugging session
git-svn-id: svn://localhost/ardour2/branches/3.0@10336 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/pannable.cc | 3 | ||||
-rw-r--r-- | libs/ardour/panner.cc | 7 | ||||
-rw-r--r-- | libs/ardour/panner_shell.cc | 4 | ||||
-rw-r--r-- | libs/ardour/region_factory.cc | 12 | ||||
-rw-r--r-- | libs/ardour/route.cc | 6 | ||||
-rw-r--r-- | libs/ardour/session.cc | 6 | ||||
-rw-r--r-- | libs/ardour/session_state.cc | 12 |
7 files changed, 26 insertions, 24 deletions
diff --git a/libs/ardour/pannable.cc b/libs/ardour/pannable.cc index 4dad58ed12..92e91f53c1 100644 --- a/libs/ardour/pannable.cc +++ b/libs/ardour/pannable.cc @@ -20,6 +20,7 @@ #include "pbd/error.h" #include "pbd/convert.h" #include "pbd/compose.h" +#include "pbd/boost_debug.h" #include "ardour/debug.h" #include "ardour/automation_control.h" @@ -48,6 +49,8 @@ Pannable::Pannable (Session& s) , _has_state (false) , _responding_to_control_auto_state_change (0) { + //boost_debug_shared_ptr_mark_interesting (this, "pannable"); + add_control (pan_azimuth_control); add_control (pan_elevation_control); add_control (pan_width_control); diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc index a182f0b99c..0713e48fe5 100644 --- a/libs/ardour/panner.cc +++ b/libs/ardour/panner.cc @@ -17,6 +17,8 @@ */ +#include "pbd/boost_debug.h" + #include "ardour/audio_buffer.h" #include "ardour/buffer_set.h" #include "ardour/debug.h" @@ -31,13 +33,14 @@ using namespace std; using namespace ARDOUR; Panner::Panner (boost::shared_ptr<Pannable> p) - : _pannable (p) { + // boost_debug_shared_ptr_mark_interesting (this, "panner"); + _pannable = p; } Panner::~Panner () { - DEBUG_TRACE(PBD::DEBUG::Destruction, string_compose ("panner @ %1 destructor, pannable is %2\n", this, _pannable)); + DEBUG_TRACE(PBD::DEBUG::Destruction, string_compose ("panner @ %1 destructor, pannable is %2 @ %3\n", this, _pannable, &_pannable)); } XMLNode& diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc index bffcb0cccb..ad2040792a 100644 --- a/libs/ardour/panner_shell.cc +++ b/libs/ardour/panner_shell.cc @@ -74,7 +74,7 @@ PannerShell::PannerShell (string name, Session& s, boost::shared_ptr<Pannable> p PannerShell::~PannerShell () { - DEBUG_TRACE(DEBUG::Destruction, string_compose ("panner shell for %1 destructor, pannable is %2\n", _name, _pannable)); + DEBUG_TRACE(DEBUG::Destruction, string_compose ("panner shell %3 for %1 destructor, panner is %4, pannable is %2\n", _name, _pannable, this, _panner)); } void @@ -118,7 +118,7 @@ PannerShell::configure_io (ChanCount in, ChanCount out) } Panner* p = pi->descriptor.factory (_pannable, speakers); - boost_debug_shared_ptr_mark_interesting (p, "Panner"); + // boost_debug_shared_ptr_mark_interesting (p, "Panner"); _panner.reset (p); _panner->configure_io (in, out); diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index 2c1a451335..fba60fe0a0 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -82,7 +82,7 @@ RegionFactory::create (boost::shared_ptr<const Region> region, bool announce) } #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); + // boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); #endif return ret; } @@ -119,7 +119,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, const PropertyList& pli } #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); + // boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); #endif return ret; } @@ -156,7 +156,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, frameoffset_t offset, c } #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); + // boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); #endif return ret; } @@ -193,7 +193,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, const SourceList& srcs, } #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); + // boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); #endif return ret; } @@ -233,7 +233,7 @@ RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool a } #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); + // boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); #endif return ret; } @@ -273,7 +273,7 @@ RegionFactory::create (SourceList& srcs, const XMLNode& node) } #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); + // boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); #endif return ret; } diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 68d9553673..b624410a27 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -126,11 +126,7 @@ Route::init () /* panning */ if (!(_flags & Route::MonitorOut)) { - Pannable* p = new Pannable (_session); -#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - boost_debug_shared_ptr_mark_interesting (p, "Pannable"); -#endif - _pannable.reset (p); + _pannable.reset (new Pannable (_session)); } /* input and output objects */ diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 618f553a28..7aaf370a24 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -1497,7 +1497,7 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m track->use_new_diskstream(); #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - boost_debug_shared_ptr_mark_interesting (track.get(), "Track"); + // boost_debug_shared_ptr_mark_interesting (track.get(), "Track"); #endif { Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); @@ -1724,7 +1724,7 @@ Session::new_audio_track ( track->use_new_diskstream(); #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - boost_debug_shared_ptr_mark_interesting (track.get(), "Track"); + // boost_debug_shared_ptr_mark_interesting (track.get(), "Track"); #endif { Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); @@ -1839,7 +1839,7 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r } #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - boost_debug_shared_ptr_mark_interesting (bus.get(), "Route"); + // boost_debug_shared_ptr_mark_interesting (bus.get(), "Route"); #endif { Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index f21d80e717..5096401226 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -570,7 +570,7 @@ Session::create (const string& mix_template, BusProfile* bus_profile) return -1; } #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - boost_debug_shared_ptr_mark_interesting (r.get(), "Route"); + // boost_debug_shared_ptr_mark_interesting (r.get(), "Route"); #endif { Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); @@ -587,7 +587,7 @@ Session::create (const string& mix_template, BusProfile* bus_profile) return -1; } #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - boost_debug_shared_ptr_mark_interesting (r.get(), "Route"); + // boost_debug_shared_ptr_mark_interesting (r.get(), "Route"); #endif { Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); @@ -1500,7 +1500,7 @@ Session::XMLRouteFactory (const XMLNode& node, int version) } #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - boost_debug_shared_ptr_mark_interesting (track.get(), "Track"); + // boost_debug_shared_ptr_mark_interesting (track.get(), "Track"); #endif ret = track; @@ -1509,7 +1509,7 @@ Session::XMLRouteFactory (const XMLNode& node, int version) 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"); + // boost_debug_shared_ptr_mark_interesting (r.get(), "Route"); #endif ret = r; } @@ -1572,7 +1572,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"); + // boost_debug_shared_ptr_mark_interesting (track.get(), "Track"); #endif ret = track; @@ -1581,7 +1581,7 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version) 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"); + // boost_debug_shared_ptr_mark_interesting (r.get(), "Route"); #endif ret = r; } |