From b03af3dc58d343d208dc25acb7d538d9038d0b43 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 30 Nov 2009 17:38:32 +0000 Subject: [PATCH] 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 --- libs/ardour/session_process.cc | 4 ++-- 1 file 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 {