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

#ifdef-ize all/most uses of the boost debug hooks API

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8823 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-02-10 18:33:43 +00:00
parent 01471c8879
commit 7cf4419d62
9 changed files with 64 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/monitor_section.cc
View file

@ -43,7 +43,7 @@ MonitorSection::MonitorSection (Session* s)
, dim_control (0) , dim_control (0)
, solo_boost_adjustment (1.0, 1.0, 3.0, 0.01, 0.1) // upper and lower will be reset to match model , solo_boost_adjustment (1.0, 1.0, 3.0, 0.01, 0.1) // upper and lower will be reset to match model
, solo_boost_control (0) , solo_boost_control (0)
, solo_cut_adjustment (0.0, 0.0, 1.0, 0.01, 0.1) // upper and lower will be reset to match model , solo_cut_adjustment (0.0, 0.0, 1.0, 0.01, 0.1)
, solo_cut_control (0) , solo_cut_control (0)
, solo_in_place_button (solo_model_group, _("SiP")) , solo_in_place_button (solo_model_group, _("SiP"))
, afl_button (solo_model_group, _("AFL")) , afl_button (solo_model_group, _("AFL"))
@ -74,7 +74,7 @@ MonitorSection::MonitorSection (Session* s)
/* Dim */ /* Dim */
dim_control = new VolumeController (little_knob_pixbuf, &dim_adjustment, false, 30, 30); dim_control = new MotionFeedback (little_knob_pixbuf, MotionFeedback::Rotary, "", &dim_adjustment, false, 30, 30);
HBox* dim_packer = manage (new HBox); HBox* dim_packer = manage (new HBox);
dim_packer->show (); dim_packer->show ();
@ -138,7 +138,7 @@ MonitorSection::MonitorSection (Session* s)
/* Solo Boost */ /* Solo Boost */
solo_boost_control = new VolumeController (little_knob_pixbuf, &solo_boost_adjustment, false, 30, 30); solo_boost_control = new MotionFeedback (little_knob_pixbuf, MotionFeedback::Rotary, "", &solo_boost_adjustment, false, 30, 30);
HBox* solo_packer = manage (new HBox); HBox* solo_packer = manage (new HBox);
solo_packer->set_spacing (12); solo_packer->set_spacing (12);
@ -238,7 +238,7 @@ MonitorSection::MonitorSection (Session* s)
/* Gain */ /* Gain */
gain_control = new VolumeController (big_knob_pixbuf, &gain_adjustment, false, 80, 80); gain_control = new MotionFeedback (big_knob_pixbuf, MotionFeedback::Rotary, "", &gain_adjustment, false, 80, 80);
spin_label = manage (new Label (_("Gain"))); spin_label = manage (new Label (_("Gain")));
spin_packer = manage (new VBox); spin_packer = manage (new VBox);

7
gtk2_ardour/monitor_section.h
View file

@ -28,6 +28,7 @@
namespace Gtkmm2ext { namespace Gtkmm2ext {
class TearOff; class TearOff;
class MotionFeedback;
} }
class VolumeController; class VolumeController;
@ -64,11 +65,11 @@ class MonitorSection : public RouteUI
ChannelButtons _channel_buttons; ChannelButtons _channel_buttons;
Gtk::Adjustment gain_adjustment; Gtk::Adjustment gain_adjustment;
VolumeController* gain_control; Gtkmm2ext::MotionFeedback* gain_control;
Gtk::Adjustment dim_adjustment; Gtk::Adjustment dim_adjustment;
VolumeController* dim_control; Gtkmm2ext::MotionFeedback* dim_control;
Gtk::Adjustment solo_boost_adjustment; Gtk::Adjustment solo_boost_adjustment;
VolumeController* solo_boost_control; Gtkmm2ext::MotionFeedback* solo_boost_control;
Gtk::Adjustment solo_cut_adjustment; Gtk::Adjustment solo_cut_adjustment;
VolumeController* solo_cut_control; VolumeController* solo_cut_control;

5
gtk2_ardour/volume_controller.cc
View file

@ -30,11 +30,8 @@ VolumeController::VolumeController (Glib::RefPtr<Gdk::Pixbuf> p,
int subw, int subh) int subw, int subh)
: MotionFeedback (p, MotionFeedback::Rotary, "", adj, with_numeric, subw, subh) : MotionFeedback (p, MotionFeedback::Rotary, "", adj, with_numeric, subw, subh)
, adjustment (adj)
{ {
get_adjustment()->signal_value_changed().connect (mem_fun (*this,&VolumeController::adjustment_value_changed));
adjustment = get_adjustment(); // in case null was passed in
adjustment->signal_value_changed().connect(mem_fun (*this,&VolumeController::adjustment_value_changed));
} }
void void

12
libs/ardour/region_factory.cc
View file

@ -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"); boost_debug_shared_ptr_mark_interesting (ret.get(), "Region");
#endif
return ret; return ret;
} }
@ -110,7 +112,9 @@ 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; 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"); boost_debug_shared_ptr_mark_interesting (ret.get(), "Region");
#endif
return ret; return ret;
} }
@ -180,7 +186,9 @@ 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; 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"); boost_debug_shared_ptr_mark_interesting (ret.get(), "Region");
#endif
return ret; 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"); boost_debug_shared_ptr_mark_interesting (ret.get(), "Region");
#endif
return ret; return ret;
} }

2
libs/ardour/route.cc
View file

@ -120,7 +120,9 @@ Route::init ()
/* panning */ /* panning */
Pannable* p = new Pannable (_session); Pannable* p = new Pannable (_session);
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
boost_debug_shared_ptr_mark_interesting (p, "Pannable"); boost_debug_shared_ptr_mark_interesting (p, "Pannable");
#endif
_pannable.reset (p); _pannable.reset (p);
/* input and output objects */ /* input and output objects */

8
libs/ardour/session.cc
View file

@ -328,7 +328,9 @@ Session::destroy ()
DEBUG_TRACE (DEBUG::Destruction, "Session::destroy() done\n"); DEBUG_TRACE (DEBUG::Destruction, "Session::destroy() done\n");
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
boost_debug_list_ptrs (); boost_debug_list_ptrs ();
#endif
} }
void void
@ -1533,7 +1535,9 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m
mt->use_new_diskstream(); mt->use_new_diskstream();
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
boost_debug_shared_ptr_mark_interesting (mt, "Track"); boost_debug_shared_ptr_mark_interesting (mt, "Track");
#endif
track = boost::shared_ptr<MidiTrack>(mt); 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(); at->use_new_diskstream();
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
boost_debug_shared_ptr_mark_interesting (at, "Track"); boost_debug_shared_ptr_mark_interesting (at, "Track");
#endif
track = boost::shared_ptr<AudioTrack>(at); track = boost::shared_ptr<AudioTrack>(at);
{ {
@ -1820,7 +1826,9 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r
goto failure; goto failure;
} }
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
boost_debug_shared_ptr_mark_interesting (rt, "Route"); boost_debug_shared_ptr_mark_interesting (rt, "Route");
#endif
boost::shared_ptr<Route> bus (rt); boost::shared_ptr<Route> bus (rt);
{ {

12
libs/ardour/session_state.cc
View file

@ -582,7 +582,9 @@ Session::create (const string& mix_template, BusProfile* bus_profile)
delete rt; delete rt;
return -1; return -1;
} }
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
boost_debug_shared_ptr_mark_interesting (rt, "Route"); boost_debug_shared_ptr_mark_interesting (rt, "Route");
#endif
boost::shared_ptr<Route> r (rt); boost::shared_ptr<Route> r (rt);
{ {
Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
@ -599,7 +601,9 @@ Session::create (const string& mix_template, BusProfile* bus_profile)
delete rt; delete rt;
return -1; return -1;
} }
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
boost_debug_shared_ptr_mark_interesting (rt, "Route"); boost_debug_shared_ptr_mark_interesting (rt, "Route");
#endif
boost::shared_ptr<Route> r (rt); boost::shared_ptr<Route> r (rt);
{ {
Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
@ -1516,14 +1520,18 @@ Session::XMLRouteFactory (const XMLNode& node, int version)
return ret; return ret;
} }
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
boost_debug_shared_ptr_mark_interesting (track, "Track"); boost_debug_shared_ptr_mark_interesting (track, "Track");
#endif
ret.reset (track); ret.reset (track);
} else { } else {
Route* rt = new Route (*this, X_("toBeResetFroXML")); Route* rt = new Route (*this, X_("toBeResetFroXML"));
if (rt->init () == 0 && rt->set_state (node, version) == 0) { if (rt->init () == 0 && rt->set_state (node, version) == 0) {
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
boost_debug_shared_ptr_mark_interesting (rt, "Route"); boost_debug_shared_ptr_mark_interesting (rt, "Route");
#endif
ret.reset (rt); ret.reset (rt);
} else { } else {
delete rt; delete rt;
@ -1589,14 +1597,18 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version)
track->set_diskstream (*i); track->set_diskstream (*i);
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
boost_debug_shared_ptr_mark_interesting (track, "Track"); boost_debug_shared_ptr_mark_interesting (track, "Track");
#endif
ret.reset (track); ret.reset (track);
} else { } else {
Route* rt = new Route (*this, X_("toBeResetFroXML")); Route* rt = new Route (*this, X_("toBeResetFroXML"));
if (rt->init () == 0 && rt->set_state (node, version) == 0) { if (rt->init () == 0 && rt->set_state (node, version) == 0) {
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
boost_debug_shared_ptr_mark_interesting (rt, "Route"); boost_debug_shared_ptr_mark_interesting (rt, "Route");
#endif
ret.reset (rt); ret.reset (rt);
} else { } else {
delete rt; delete rt;

18
libs/ardour/source_factory.cc
View file

@ -124,7 +124,9 @@ boost::shared_ptr<Source>
SourceFactory::createSilent (Session& s, const XMLNode& node, framecnt_t nframes, float sr) SourceFactory::createSilent (Session& s, const XMLNode& node, framecnt_t nframes, float sr)
{ {
Source* src = new SilentFileSource (s, node, nframes, sr); Source* src = new SilentFileSource (s, node, nframes, sr);
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
// boost_debug_shared_ptr_mark_interesting (src, "Source"); // boost_debug_shared_ptr_mark_interesting (src, "Source");
#endif
boost::shared_ptr<Source> ret (src); boost::shared_ptr<Source> ret (src);
// no analysis data - the file is non-existent // no analysis data - the file is non-existent
SourceCreated (ret); SourceCreated (ret);
@ -145,7 +147,9 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
try { try {
Source* src = new SndFileSource (s, node); Source* src = new SndFileSource (s, node);
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
// boost_debug_shared_ptr_mark_interesting (src, "Source"); // boost_debug_shared_ptr_mark_interesting (src, "Source");
#endif
boost::shared_ptr<Source> ret (src); boost::shared_ptr<Source> ret (src);
if (setup_peakfile (ret, defer_peaks)) { if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>(); return boost::shared_ptr<Source>();
@ -162,7 +166,9 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
/* this is allowed to throw */ /* this is allowed to throw */
Source *src = new CoreAudioSource (s, node); Source *src = new CoreAudioSource (s, node);
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
// boost_debug_shared_ptr_mark_interesting (src, "Source"); // boost_debug_shared_ptr_mark_interesting (src, "Source");
#endif
boost::shared_ptr<Source> ret (src); boost::shared_ptr<Source> ret (src);
if (setup_peakfile (ret, defer_peaks)) { 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) { } else if (type == DataType::MIDI) {
boost::shared_ptr<SMFSource> src (new SMFSource (s, node)); boost::shared_ptr<SMFSource> src (new SMFSource (s, node));
src->load_model (true, true); src->load_model (true, true);
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
// boost_debug_shared_ptr_mark_interesting (src, "Source"); // boost_debug_shared_ptr_mark_interesting (src, "Source");
#endif
src->check_for_analysis_data_on_disk (); src->check_for_analysis_data_on_disk ();
SourceCreated (src); SourceCreated (src);
return src; return src;
@ -200,7 +208,9 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path,
try { try {
Source* src = new SndFileSource (s, path, chn, flags); Source* src = new SndFileSource (s, path, chn, flags);
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
// boost_debug_shared_ptr_mark_interesting (src, "Source"); // boost_debug_shared_ptr_mark_interesting (src, "Source");
#endif
boost::shared_ptr<Source> ret (src); boost::shared_ptr<Source> ret (src);
if (setup_peakfile (ret, defer_peaks)) { if (setup_peakfile (ret, defer_peaks)) {
@ -218,7 +228,9 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path,
#ifdef USE_COREAUDIO_FOR_FILES #ifdef USE_COREAUDIO_FOR_FILES
Source* src = new CoreAudioSource (s, path, chn, flags); Source* src = new CoreAudioSource (s, path, chn, flags);
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
// boost_debug_shared_ptr_mark_interesting (src, "Source"); // boost_debug_shared_ptr_mark_interesting (src, "Source");
#endif
boost::shared_ptr<Source> ret (src); boost::shared_ptr<Source> ret (src);
if (setup_peakfile (ret, defer_peaks)) { if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>(); 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)); SMFSource* src = new SMFSource (s, path, SMFSource::Flag(0));
src->load_model (true, true); src->load_model (true, true);
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
// boost_debug_shared_ptr_mark_interesting (src, "Source"); // boost_debug_shared_ptr_mark_interesting (src, "Source");
#endif
boost::shared_ptr<Source> ret (src); boost::shared_ptr<Source> ret (src);
if (announce) { if (announce) {
@ -270,7 +284,9 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat
(destructive (destructive
? Source::Flag (SndFileSource::default_writable_flags | Source::Destructive) ? Source::Flag (SndFileSource::default_writable_flags | Source::Destructive)
: SndFileSource::default_writable_flags)); : SndFileSource::default_writable_flags));
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
// boost_debug_shared_ptr_mark_interesting (src, "Source"); // boost_debug_shared_ptr_mark_interesting (src, "Source");
#endif
boost::shared_ptr<Source> ret (src); boost::shared_ptr<Source> ret (src);
if (setup_peakfile (ret, defer_peaks)) { 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 // XXX writable flags should belong to MidiSource too
boost::shared_ptr<SMFSource> src (new SMFSource (s, path, SndFileSource::default_writable_flags)); boost::shared_ptr<SMFSource> src (new SMFSource (s, path, SndFileSource::default_writable_flags));
src->load_model (true, true); src->load_model (true, true);
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
// boost_debug_shared_ptr_mark_interesting (src, "Source"); // boost_debug_shared_ptr_mark_interesting (src, "Source");
#endif
// no analysis data - this is a new file // no analysis data - this is a new file

1
libs/pbd/pbd/boost_debug.h
View file

@ -25,5 +25,6 @@
void boost_debug_shared_ptr_mark_interesting (void* ptr, const char* type); void boost_debug_shared_ptr_mark_interesting (void* ptr, const char* type);
void boost_debug_list_ptrs (); void boost_debug_list_ptrs ();
void boost_debug_shared_ptr_show_live_debugging (bool yn);
#endif /* __pbd_boost_debug_h__ */ #endif /* __pbd_boost_debug_h__ */