summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-03-16 06:49:23 +0000
committerDavid Robillard <d@drobilla.net>2011-03-16 06:49:23 +0000
commit4fc42bca44651b927d336110c23e789691f3bb48 (patch)
treeebb64746cfaa6a86d210c11381779b3e689608ec
parentc4c40340855dff6191a670d3130d65b1e79dc8a0 (diff)
Replace connection cerr dumping with DEBUG_TRACE.
Logging here is unusably slow for adding a large number of tracks. git-svn-id: svn://localhost/ardour2/branches/3.0@9156 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--libs/ardour/port.cc5
-rw-r--r--libs/ardour/session.cc23
2 files changed, 19 insertions, 9 deletions
diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index c66995bb3c..df1690da37 100644
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -341,7 +341,7 @@ Port::get_connected_latency_range (jack_latency_range_t& range, bool playback) c
range.min = ~((jack_nframes_t) 0);
range.max = 0;
- DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: %2 connections to check for latency range\n", name(), connections.size()));
+ DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: %2 connections to check for latency range\n", name(), connections.size()));
for (vector<string>::const_iterator c = connections.begin();
c != connections.end(); ++c) {
@@ -354,6 +354,7 @@ Port::get_connected_latency_range (jack_latency_range_t& range, bool playback) c
remote_port,
(playback ? JackPlaybackLatency : JackCaptureLatency),
&lr);
+
DEBUG_TRACE (DEBUG::Latency, string_compose (
"\t%1 <-> %2 : latter has latency range %3 .. %4\n",
name(), *c, lr.min, lr.max));
@@ -363,7 +364,7 @@ Port::get_connected_latency_range (jack_latency_range_t& range, bool playback) c
}
} else {
- DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: not connected to anything\n", name()));
+ DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: not connected to anything\n", name()));
range.min = 0;
range.max = 0;
}
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 35aebf7eff..19c7f5638f 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1531,7 +1531,9 @@ Session::auto_connect_route (Route* route, ChanCount& existing_inputs, ChanCount
offset possible.
*/
- cerr << "Auto-connect: existing in = " << existing_inputs << " out = " << existing_outputs << endl;
+ DEBUG_TRACE (DEBUG::Graph,
+ string_compose("Auto-connect: existing in = %1 out = %2\n",
+ existing_inputs, existing_outputs));
const bool in_out_physical =
(Config->get_input_auto_connect() & AutoConnectPhysical)
@@ -1556,19 +1558,24 @@ Session::auto_connect_route (Route* route, ChanCount& existing_inputs, ChanCount
if (!physinputs.empty() && connect_inputs) {
uint32_t nphysical_in = physinputs.size();
- cerr << "There are " << nphysical_in << " physical inputs of type " << *t << endl;
+ DEBUG_TRACE (DEBUG::Graph,
+ string_compose("There are %1 physical inputs of type %2\n",
+ nphysical_in, *t));
for (uint32_t i = input_start.get(*t); i < route->n_inputs().get(*t) && i < nphysical_in; ++i) {
string port;
if (Config->get_input_auto_connect() & AutoConnectPhysical) {
- cerr << "Get index " << in_offset.get(*t) << " + " << i << " % " << nphysical_in << " = "
- << (in_offset.get(*t) + i) % nphysical_in
- << endl;
+ DEBUG_TRACE (DEBUG::Graph,
+ string_compose("Get index %1 + %2 % %3 = %4\n",
+ in_offset.get(*t), i, nphysical_in,
+ (in_offset.get(*t) + i) % nphysical_in));
port = physinputs[(in_offset.get(*t) + i) % nphysical_in];
}
- cerr << "Connect route " << route->name() << " IN to " << port << endl;
+ DEBUG_TRACE (DEBUG::Graph,
+ string_compose("Connect route %1 IN to %2\n",
+ route->name(), port));
if (!port.empty() && route->input()->connect (
route->input()->ports().port(*t, i), port, this)) {
@@ -1591,7 +1598,9 @@ Session::auto_connect_route (Route* route, ChanCount& existing_inputs, ChanCount
}
}
- cerr << "Connect route " << route->name() << " OUT to " << port << endl;
+ DEBUG_TRACE (DEBUG::Graph,
+ string_compose("Connect route %1 OUT to %2\n",
+ route->name(), port));
if (!port.empty() && route->output()->connect (
route->output()->ports().port(*t, i), port, this)) {