#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

diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index 8173e8833dcc124fd6c7cb26148c1fd0ae9cc1ba..c281b0ccaf9d4069f2a68ad5fa075e225d99017c 100644 (file)
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -43,7 +43,7 @@ MonitorSection::MonitorSection (Session* s)
         , 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_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_in_place_button (solo_model_group, _("SiP"))
         , afl_button (solo_model_group, _("AFL"))
@@ -74,7 +74,7 @@ MonitorSection::MonitorSection (Session* s)
 
         /* 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);
         dim_packer->show ();
@@ -138,7 +138,7 @@ MonitorSection::MonitorSection (Session* s)
 
         /* 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);
         solo_packer->set_spacing (12);
@@ -238,7 +238,7 @@ MonitorSection::MonitorSection (Session* s)
 
         /* 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_packer = manage (new VBox);

diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h
index b3edb624b9862101cd24ff6f288ffe8fdc148a00..bc502d9979bdb84a91ea043d9bc95f0d203c3590 100644 (file)
--- a/gtk2_ardour/monitor_section.h
+++ b/gtk2_ardour/monitor_section.h
@@ -28,6 +28,7 @@
 
 namespace Gtkmm2ext {
         class TearOff;
+        class MotionFeedback;
 }
 
 class VolumeController;
@@ -64,11 +65,11 @@ class MonitorSection : public RouteUI
         ChannelButtons _channel_buttons;
 
         Gtk::Adjustment   gain_adjustment;
-        VolumeController* gain_control;
+        Gtkmm2ext::MotionFeedback* gain_control;
         Gtk::Adjustment   dim_adjustment;
-        VolumeController* dim_control;
+        Gtkmm2ext::MotionFeedback* dim_control;
         Gtk::Adjustment   solo_boost_adjustment;
-        VolumeController* solo_boost_control;
+        Gtkmm2ext::MotionFeedback* solo_boost_control;
         Gtk::Adjustment   solo_cut_adjustment;
         VolumeController* solo_cut_control;
 

diff --git a/gtk2_ardour/volume_controller.cc b/gtk2_ardour/volume_controller.cc
index 8c5e9bcb1b708440b23c37d055a19a641b87079e..8cf6e6862003610c9dbe7854704ab35299cd9f36 100644 (file)
--- a/gtk2_ardour/volume_controller.cc
+++ b/gtk2_ardour/volume_controller.cc
@@ -30,11 +30,8 @@ VolumeController::VolumeController (Glib::RefPtr<Gdk::Pixbuf> p,
                                     int subw, int subh)
 
        : MotionFeedback (p, MotionFeedback::Rotary, "", adj, with_numeric, subw, subh)
-        , adjustment (adj)
 {                        
-
-        adjustment = get_adjustment(); // in case null was passed in
-       adjustment->signal_value_changed().connect(mem_fun (*this,&VolumeController::adjustment_value_changed));
+       get_adjustment()->signal_value_changed().connect (mem_fun (*this,&VolumeController::adjustment_value_changed));
 }
 
 void

diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc
index 96a88a6e090fb6d2543c6b315fd2b5d68be117a0..1fd81f9a4bcea818bdb2689220c1730ea522e97a 100644 (file)
--- 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 2e60f0fb767029894e73301558d0cc6f900a420e..68a4019cf75dc7b94a13ac9595779590b688080d 100644 (file)
--- 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 aa0b29ed1ee3793822f3664e19d91e1b372125d6..de0076372f274a4840a0cb49948bd6db40194799 100644 (file)
--- 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 453d0ac772fd494daa0594e468376658aec645ab..31c1c439a83ef6cbf7cdfd8b2d481277452d0d03 100644 (file)
--- 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 b7c4a8ff56f2ae45884981980bcf9a16d04a914a..f8b721b99a15fac60fdb2920ff32cb014ffb2d7a 100644 (file)
--- 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
 

diff --git a/libs/pbd/pbd/boost_debug.h b/libs/pbd/pbd/boost_debug.h
index bdf2e017e2e2b9e2e7a0f39a907bd3d8a24d5abe..6a0e4970fdf6ac6d8a8d551ddc0cad04cc2971a7 100644 (file)
--- a/libs/pbd/pbd/boost_debug.h
+++ b/libs/pbd/pbd/boost_debug.h
@@ -25,5 +25,6 @@
 
 void boost_debug_shared_ptr_mark_interesting (void* ptr, const char* type);
 void boost_debug_list_ptrs ();
+void boost_debug_shared_ptr_show_live_debugging (bool yn);
 
 #endif /* __pbd_boost_debug_h__ */