Reduce stdout/stderr clutter, prefer DEBUG_TRACE

diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc
index 393ee442c398fd3ef57f4453a124e2616c967e58..98627588f43bc69aabe9e56fbd0b201ff950b08e 100644 (file)
--- a/libs/ardour/butler.cc
+++ b/libs/ardour/butler.cc
@@ -85,19 +85,11 @@ Butler::config_changed (std::string p)
                        /* size is in Samples, not bytes */
                        audio_dstream_playback_buffer_size = (uint32_t) floor (Config->get_audio_playback_buffer_seconds() * _session.sample_rate());
                        _session.adjust_playback_buffering ();
-               } else {
-#ifndef NDEBUG
-                       std::cerr << "Skip explicit buffer seconds, preset in use\n";
-#endif
                }
        } else if (p == "capture-buffer-seconds") {
                if (Config->get_buffering_preset() == Custom) {
                        audio_dstream_capture_buffer_size = (uint32_t) floor (Config->get_audio_capture_buffer_seconds() * _session.sample_rate());
                        _session.adjust_capture_buffering ();
-               } else {
-#ifndef NDEBUG
-                       std::cerr << "Skip explicit buffer seconds, preset in use\n";
-#endif
                }
        } else if (p == "buffering-preset") {
                DiskIOProcessor::set_buffering_parameters (Config->get_buffering_preset());

diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index c7be44a4c895507f38ca1a526d1621b5f6f6c693..2a5afaf1b432291e87b6ef1628154bfefe865ad0 100644 (file)
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -485,9 +485,7 @@ ControlProtocolManager::set_state (const XMLNode& node, int session_specific_sta
                        ControlProtocolInfo* cpi = cpi_by_name (name);
 
                        if (cpi) {
-#ifndef NDEBUG
-                               std::cerr << "protocol " << name << " active ? " << active << std::endl;
-#endif
+                               DEBUG_TRACE (DEBUG::ControlProtocols, string_compose ("Protocolstate %1 %2\n", name, active ? "active" : "inactive"));
 
                                if (active) {
                                        delete cpi->state;

diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc
index 8464034f5bfe909070c3f5fd822459c71065274d..5d9b924ab5747215f2e6258d5a5d39d5c4678c72 100644 (file)
--- a/libs/pbd/controllable.cc
+++ b/libs/pbd/controllable.cc
@@ -136,6 +136,9 @@ void
 Controllable::dump_registry ()
 {
        Glib::Threads::RWLock::ReaderLock lm (registry_lock);
+       if (registry.size() == 0) {
+               return;
+       }
        unsigned int cnt = 0;
        cout << "-- List Of Registered Controllables\n";
        for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i, ++cnt) {