diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-10 18:33:43 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-10 18:33:43 +0000 |
commit | 7cf4419d62d286bd3a62c98e891f35678f061479 (patch) | |
tree | 35321733edef6d1c8824471f834aca61303e4e40 /libs/ardour | |
parent | 01471c8879869dc87a6a17d88c945728a3193325 (diff) |
#ifdef-ize all/most uses of the boost debug hooks API
git-svn-id: svn://localhost/ardour2/branches/3.0@8823 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/region_factory.cc | 16 | ||||
-rw-r--r-- | libs/ardour/route.cc | 2 | ||||
-rw-r--r-- | libs/ardour/session.cc | 8 | ||||
-rw-r--r-- | libs/ardour/session_state.cc | 12 | ||||
-rw-r--r-- | libs/ardour/source_factory.cc | 18 |
5 files changed, 54 insertions, 2 deletions
diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index 96a88a6e09..1fd81f9a4b 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -75,7 +75,9 @@ 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"); +#endif return ret; } @@ -110,7 +112,9 @@ RegionFactory::create (boost::shared_ptr<Region> region, const PropertyList& pli } } - boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#endif return ret; } @@ -145,7 +149,9 @@ 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"); +#endif return ret; } @@ -180,7 +186,9 @@ RegionFactory::create (boost::shared_ptr<Region> region, const SourceList& srcs, } } - boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#endif return ret; } @@ -218,7 +226,9 @@ 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"); +#endif return ret; } @@ -256,7 +266,9 @@ RegionFactory::create (SourceList& srcs, const XMLNode& node) } } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS 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 2e60f0fb76..68a4019cf7 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -120,7 +120,9 @@ Route::init () /* panning */ Pannable* p = 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 */ diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index aa0b29ed1e..de0076372f 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -328,7 +328,9 @@ Session::destroy () DEBUG_TRACE (DEBUG::Destruction, "Session::destroy() done\n"); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS boost_debug_list_ptrs (); +#endif } void @@ -1533,7 +1535,9 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m mt->use_new_diskstream(); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS boost_debug_shared_ptr_mark_interesting (mt, "Track"); +#endif track = boost::shared_ptr<MidiTrack>(mt); { @@ -1702,7 +1706,9 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod at->use_new_diskstream(); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS boost_debug_shared_ptr_mark_interesting (at, "Track"); +#endif track = boost::shared_ptr<AudioTrack>(at); { @@ -1820,7 +1826,9 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r goto failure; } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS boost_debug_shared_ptr_mark_interesting (rt, "Route"); +#endif boost::shared_ptr<Route> bus (rt); { diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 453d0ac772..31c1c439a8 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -582,7 +582,9 @@ Session::create (const string& mix_template, BusProfile* bus_profile) delete rt; return -1; } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS boost_debug_shared_ptr_mark_interesting (rt, "Route"); +#endif boost::shared_ptr<Route> r (rt); { Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); @@ -599,7 +601,9 @@ Session::create (const string& mix_template, BusProfile* bus_profile) delete rt; return -1; } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS boost_debug_shared_ptr_mark_interesting (rt, "Route"); +#endif boost::shared_ptr<Route> r (rt); { Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); @@ -1516,14 +1520,18 @@ Session::XMLRouteFactory (const XMLNode& node, int version) return ret; } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS boost_debug_shared_ptr_mark_interesting (track, "Track"); +#endif ret.reset (track); } else { Route* rt = new Route (*this, X_("toBeResetFroXML")); if (rt->init () == 0 && rt->set_state (node, version) == 0) { +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS boost_debug_shared_ptr_mark_interesting (rt, "Route"); +#endif ret.reset (rt); } else { delete rt; @@ -1589,14 +1597,18 @@ 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, "Track"); +#endif ret.reset (track); } else { Route* rt = new Route (*this, X_("toBeResetFroXML")); if (rt->init () == 0 && rt->set_state (node, version) == 0) { +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS boost_debug_shared_ptr_mark_interesting (rt, "Route"); +#endif ret.reset (rt); } else { delete rt; diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index b7c4a8ff56..f8b721b99a 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -124,7 +124,9 @@ boost::shared_ptr<Source> SourceFactory::createSilent (Session& s, const XMLNode& node, framecnt_t nframes, float sr) { Source* src = new SilentFileSource (s, node, nframes, sr); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif boost::shared_ptr<Source> ret (src); // no analysis data - the file is non-existent SourceCreated (ret); @@ -145,7 +147,9 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) try { Source* src = new SndFileSource (s, node); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif boost::shared_ptr<Source> ret (src); if (setup_peakfile (ret, defer_peaks)) { return boost::shared_ptr<Source>(); @@ -162,7 +166,9 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) /* this is allowed to throw */ Source *src = new CoreAudioSource (s, node); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif boost::shared_ptr<Source> ret (src); if (setup_peakfile (ret, defer_peaks)) { @@ -180,7 +186,9 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) } else if (type == DataType::MIDI) { boost::shared_ptr<SMFSource> src (new SMFSource (s, node)); src->load_model (true, true); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif src->check_for_analysis_data_on_disk (); SourceCreated (src); return src; @@ -200,7 +208,9 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, try { Source* src = new SndFileSource (s, path, chn, flags); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif boost::shared_ptr<Source> ret (src); if (setup_peakfile (ret, defer_peaks)) { @@ -218,7 +228,9 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, #ifdef USE_COREAUDIO_FOR_FILES Source* src = new CoreAudioSource (s, path, chn, flags); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif boost::shared_ptr<Source> ret (src); if (setup_peakfile (ret, defer_peaks)) { return boost::shared_ptr<Source>(); @@ -242,7 +254,9 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, SMFSource* src = new SMFSource (s, path, SMFSource::Flag(0)); src->load_model (true, true); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif boost::shared_ptr<Source> ret (src); if (announce) { @@ -270,7 +284,9 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat (destructive ? Source::Flag (SndFileSource::default_writable_flags | Source::Destructive) : SndFileSource::default_writable_flags)); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif boost::shared_ptr<Source> ret (src); if (setup_peakfile (ret, defer_peaks)) { @@ -288,7 +304,9 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat // XXX writable flags should belong to MidiSource too boost::shared_ptr<SMFSource> src (new SMFSource (s, path, SndFileSource::default_writable_flags)); src->load_model (true, true); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif // no analysis data - this is a new file |