summaryrefslogtreecommitdiff
path: root/libs/ardour/session_process.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-11-30 17:38:32 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-11-30 17:38:32 +0000
commitb03af3dc58d343d208dc25acb7d538d9038d0b43 (patch)
treec1ff197844e1b593c79a636153b826e6d3c53053 /libs/ardour/session_process.cc
parentce0757b604cefdc924c03cd7d55a3d3fbdcd0a14 (diff)
less sensitive locate when master/slave delta is too big
git-svn-id: svn://localhost/ardour2/branches/3.0@6220 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_process.cc')
-rw-r--r--libs/ardour/session_process.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index be6a57e41c..1094c6df22 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -556,9 +556,9 @@ Session::follow_slave (nframes_t nframes)
delta *= dir;
#endif
- if (fabs(delta) > engine().frames_per_cycle()) {
+ if (fabs(delta) > _slave->resolution() * 2) {
/* too far off, so locate and keep rolling */
- DEBUG_TRACE (DEBUG::Slave, string_compose ("slave delta is too big, locate to %1\n", slave_transport_frame));
+ 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);
return false;
} else {