smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

tweaks to boost debug related code, from a boost debugging session

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10336 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-10-29 15:52:38 +00:00
parent 70f4ee1b55
commit f871d665d5
7 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/pannable.cc
View file

@ -20,6 +20,7 @@
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/convert.h" #include "pbd/convert.h"
#include "pbd/compose.h" #include "pbd/compose.h"
#include "pbd/boost_debug.h"
#include "ardour/debug.h" #include "ardour/debug.h"
#include "ardour/automation_control.h" #include "ardour/automation_control.h"
@ -48,6 +49,8 @@ Pannable::Pannable (Session& s)
, _has_state (false) , _has_state (false)
, _responding_to_control_auto_state_change (0) , _responding_to_control_auto_state_change (0)
{ {
//boost_debug_shared_ptr_mark_interesting (this, "pannable");
add_control (pan_azimuth_control); add_control (pan_azimuth_control);
add_control (pan_elevation_control); add_control (pan_elevation_control);
add_control (pan_width_control); add_control (pan_width_control);

7
libs/ardour/panner.cc
View file

@ -17,6 +17,8 @@
*/ */
#include "pbd/boost_debug.h"
#include "ardour/audio_buffer.h" #include "ardour/audio_buffer.h"
#include "ardour/buffer_set.h" #include "ardour/buffer_set.h"
#include "ardour/debug.h" #include "ardour/debug.h"
@ -31,13 +33,14 @@ using namespace std;
using namespace ARDOUR; using namespace ARDOUR;
Panner::Panner (boost::shared_ptr<Pannable> p) Panner::Panner (boost::shared_ptr<Pannable> p)
: _pannable (p)
{ {
// boost_debug_shared_ptr_mark_interesting (this, "panner");
_pannable = p;
} }
Panner::~Panner () 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& XMLNode&

4
libs/ardour/panner_shell.cc
View file

@ -74,7 +74,7 @@ PannerShell::PannerShell (string name, Session& s, boost::shared_ptr<Pannable> p
PannerShell::~PannerShell () 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 void
@ -118,7 +118,7 @@ PannerShell::configure_io (ChanCount in, ChanCount out)
} }
Panner* p = pi->descriptor.factory (_pannable, speakers); 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.reset (p);
_panner->configure_io (in, out); _panner->configure_io (in, out);

12
libs/ardour/region_factory.cc
View file

@ -82,7 +82,7 @@ RegionFactory::create (boost::shared_ptr<const Region> region, bool announce)
} }
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS #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 #endif
return ret; return ret;
} }
@ -119,7 +119,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, const PropertyList& pli
} }
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS #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 #endif
return ret; return ret;
} }
@ -156,7 +156,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, frameoffset_t offset, c
} }
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS #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 #endif
return ret; return ret;
} }
@ -193,7 +193,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, const SourceList& srcs,
} }
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS #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 #endif
return ret; return ret;
} }
@ -233,7 +233,7 @@ RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool a
} }
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS #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 #endif
return ret; return ret;
} }
@ -273,7 +273,7 @@ RegionFactory::create (SourceList& srcs, const XMLNode& node)
} }
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS #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 #endif
return ret; return ret;
} }

6
libs/ardour/route.cc
View file

@ -126,11 +126,7 @@ Route::init ()
/* panning */ /* panning */
if (!(_flags & Route::MonitorOut)) { if (!(_flags & Route::MonitorOut)) {
Pannable* p = new Pannable (_session); _pannable.reset (new Pannable (_session));
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
boost_debug_shared_ptr_mark_interesting (p, "Pannable");
#endif
_pannable.reset (p);
} }
/* input and output objects */ /* input and output objects */

6
libs/ardour/session.cc
View file

@ -1497,7 +1497,7 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m
track->use_new_diskstream(); track->use_new_diskstream();
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS #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 #endif
{ {
Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
@ -1724,7 +1724,7 @@ Session::new_audio_track (
track->use_new_diskstream(); track->use_new_diskstream();
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS #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 #endif
{ {
Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); 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 #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 #endif
{ {
Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());

12
libs/ardour/session_state.cc
View file

@ -570,7 +570,7 @@ Session::create (const string& mix_template, BusProfile* bus_profile)
return -1; return -1;
} }
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS #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 #endif
{ {
Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
@ -587,7 +587,7 @@ Session::create (const string& mix_template, BusProfile* bus_profile)
return -1; return -1;
} }
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS #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 #endif
{ {
Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); 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 #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 #endif
ret = track; ret = track;
@ -1509,7 +1509,7 @@ Session::XMLRouteFactory (const XMLNode& node, int version)
if (r->init () == 0 && r->set_state (node, version) == 0) { if (r->init () == 0 && r->set_state (node, version) == 0) {
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS #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 #endif
ret = r; ret = r;
} }
@ -1572,7 +1572,7 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version)
track->set_diskstream (*i); track->set_diskstream (*i);
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS #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 #endif
ret = track; ret = track;
@ -1581,7 +1581,7 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version)
if (r->init () == 0 && r->set_state (node, version) == 0) { if (r->init () == 0 && r->set_state (node, version) == 0) {
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS #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 #endif
ret = r; ret = r;
} }