allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

change several startup messages to be triggered only by -D (debug) options

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10281 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2011-10-22 13:30:11 +00:00
parent e26121ae47
commit 47d0b88830
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/debug.h
View File

@@ -53,6 +53,7 @@ namespace PBD {
extern uint64_t CaptureAlignment;
extern uint64_t PluginManager;
extern uint64_t AudioUnits;
extern uint64_t ControlProtocols;
}
}

15
libs/ardour/control_protocol_manager.cc
View File

@@ -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);

1
libs/ardour/debug.cc
View File

@@ -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");

6
libs/ardour/plugin_manager.cc
View File

@@ -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;
}

6
libs/surfaces/powermate/powermate.cc
View File

@@ -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;
}