diff options
| -rw-r--r-- | libs/ardour/ardour/debug.h | 1 | ||||
| -rw-r--r-- | libs/ardour/control_protocol_manager.cc | 15 | ||||
| -rw-r--r-- | libs/ardour/debug.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/plugin_manager.cc | 6 | ||||
| -rw-r--r-- | libs/surfaces/powermate/powermate.cc | 6 |
5 files changed, 18 insertions, 11 deletions
diff --git a/libs/ardour/ardour/debug.h b/libs/ardour/ardour/debug.h index 2b47bf6503..0351aace1f 100644 --- a/libs/ardour/ardour/debug.h +++ b/libs/ardour/ardour/debug.h @@ -53,6 +53,7 @@ namespace PBD { extern uint64_t CaptureAlignment; extern uint64_t PluginManager; extern uint64_t AudioUnits; + extern uint64_t ControlProtocols; } } diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index afb322f41b..6a8dd77d55 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -25,6 +25,7 @@ #include "control_protocol/control_protocol.h" +#include "ardour/debug.h" #include "ardour/session.h" #include "ardour/control_protocol_manager.h" #include "ardour/control_protocol_search_path.h" @@ -176,7 +177,8 @@ ControlProtocolManager::load_mandatory_protocols () for (list<ControlProtocolInfo*>::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) { if ((*i)->mandatory && ((*i)->protocol == 0)) { - info << string_compose (_("Instantiating mandatory control protocol %1"), (*i)->name) << endmsg; + DEBUG_TRACE (DEBUG::ControlProtocols, + string_compose (_("Instantiating mandatory control protocol %1"), (*i)->name)); instantiate (**i); } } @@ -196,8 +198,9 @@ ControlProtocolManager::discover_control_protocols () find_matching_files_in_search_path (control_protocol_search_path (), dylib_extension_pattern, cp_modules); - info << string_compose (_("looking for control protocols in %1"), control_protocol_search_path().to_string()) << endmsg; - + DEBUG_TRACE (DEBUG::ControlProtocols, + string_compose (_("looking for control protocols in %1"), control_protocol_search_path().to_string())); + for (vector<sys::path>::iterator i = cp_modules.begin(); i != cp_modules.end(); ++i) { control_protocol_discover ((*i).to_string()); } @@ -211,7 +214,8 @@ ControlProtocolManager::control_protocol_discover (string path) if ((descriptor = get_descriptor (path)) != 0) { if (!descriptor->probe (descriptor)) { - info << string_compose (_("Control protocol %1 not usable"), descriptor->name) << endmsg; + DEBUG_TRACE (DEBUG::ControlProtocols, + string_compose (_("Control protocol %1 not usable"), descriptor->name)); } else { ControlProtocolInfo* cpi = new ControlProtocolInfo (); @@ -227,7 +231,8 @@ ControlProtocolManager::control_protocol_discover (string path) control_protocol_info.push_back (cpi); - info << string_compose(_("Control surface protocol discovered: \"%1\""), cpi->name) << endmsg; + DEBUG_TRACE (DEBUG::ControlProtocols, + string_compose(_("Control surface protocol discovered: \"%1\""), cpi->name)); } dlclose (descriptor->module); diff --git a/libs/ardour/debug.cc b/libs/ardour/debug.cc index f92b3c24fe..e731113dc2 100644 --- a/libs/ardour/debug.cc +++ b/libs/ardour/debug.cc @@ -50,4 +50,5 @@ uint64_t PBD::DEBUG::LV2 = PBD::new_debug_bit ("lv2"); uint64_t PBD::DEBUG::CaptureAlignment = PBD::new_debug_bit ("capturealignment"); uint64_t PBD::DEBUG::PluginManager = PBD::new_debug_bit ("pluginmanager"); uint64_t PBD::DEBUG::AudioUnits = PBD::new_debug_bit ("audiounits"); +uint64_t PBD::DEBUG::ControlProtocols = PBD::new_debug_bit ("controlprotocols"); diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index 88dc4c13a7..dc717e6b8c 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -560,7 +560,7 @@ PluginManager::vst_discover_from_path (string path) vector<string *>::iterator x; int ret = 0; - info << "detecting VST plugins along " << path << endmsg; + DEBUG_TRACE (DEBUG::PluginManager, string_compose ("detecting VST plugins along %1\n", path)); plugin_objects = scanner (vst_path, vst_filter, 0, true, true); @@ -665,7 +665,7 @@ PluginManager::lxvst_discover_from_path (string path) vector<string *>::iterator x; int ret = 0; - info << "Discovering linuxVST plugins along " << path << endmsg; + DEBUG_TRACE (DEBUG::PluginManager, string_compose ("Discovering linuxVST plugins along %1\n", path)); plugin_objects = scanner (lxvst_path, lxvst_filter, 0, true, true); @@ -675,8 +675,6 @@ PluginManager::lxvst_discover_from_path (string path) } } - info << "Done linuxVST discover" << endmsg; - vector_delete (plugin_objects); return ret; } diff --git a/libs/surfaces/powermate/powermate.cc b/libs/surfaces/powermate/powermate.cc index a3b535c9e0..44db8741ac 100644 --- a/libs/surfaces/powermate/powermate.cc +++ b/libs/surfaces/powermate/powermate.cc @@ -18,6 +18,8 @@ #include "pbd/xml++.h" #include "pbd/error.h" +#include "ardour/debug.h" + #include "powermate.h" #include "i18n.h" @@ -105,9 +107,9 @@ PowermateControlProtocol::probe () if (port < 0) { if (errno == ENOENT) { - info << "Powermate device not found; perhaps you have no powermate connected" << endmsg; + DEBUG_TRACE (DEBUG::ControlProtocols, "Powermate device not found; perhaps you have no powermate connected"); } else { - printf ("powermate: Opening of powermate failed - %s\n", strerror(errno)); + DEBUG_TRACE (DEBUG::ControlProtocols, string_compose ("powermate: Opening of powermate failed - %1\n", strerror(errno))); } return false; } |