summaryrefslogtreecommitdiff
path: root/libs/ardour/session_process.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-11-30 17:49:36 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-11-30 17:49:36 +0000
commit13e96a8cc7bb6af377164de49c25f96f0d24e7b4 (patch)
treeba3d5aeb949d7af04aad10ded9f5b1015eafcb5c /libs/ardour/session_process.cc
parentb03af3dc58d343d208dc25acb7d538d9038d0b43 (diff)
more debugging tweaks
git-svn-id: svn://localhost/ardour2/branches/3.0@6221 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_process.cc')
-rw-r--r--libs/ardour/session_process.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index 1094c6df22..d00cad512b 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -556,7 +556,19 @@ Session::follow_slave (nframes_t nframes)
delta *= dir;
#endif
- if (fabs(delta) > _slave->resolution() * 2) {
+#ifndef NDEBUG
+ if (slave_speed != 0.0) {
+ DEBUG_TRACE (DEBUG::Slave, string_compose ("delta = %1 speed = %2 ts = %3 M@%4 S@%5 avgdelta %6\n",
+ (int) (dir * this_delta),
+ slave_speed,
+ _transport_speed,
+ _transport_frame,
+ slave_transport_frame,
+ _transport_frame,
+ average_slave_delta));
+ }
+#endif
+ if (fabs(delta) > 2048) {
/* too far off, so locate and keep rolling */
DEBUG_TRACE (DEBUG::Slave, string_compose ("slave delta %1 is too big, locate to %2\n", delta, slave_transport_frame));
request_locate (slave_transport_frame, true);
@@ -581,18 +593,6 @@ Session::follow_slave (nframes_t nframes)
}
}
-#ifndef NDEBUG
- if (slave_speed != 0.0) {
- DEBUG_TRACE (DEBUG::Slave, string_compose ("delta = %1 speed = %2 ts = %3 M@%4 S@%5 avgdelta %6\n",
- (int) (dir * this_delta),
- slave_speed,
- _transport_speed,
- _transport_frame,
- slave_transport_frame,
- _transport_frame,
- average_slave_delta));
- }
-#endif
if (!starting && !non_realtime_work_pending()) {
/* speed is set, we're locked, and good to go */