From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 17 Jul 2017 16:16:00 +0000 (-0400)
Subject: probable fix for out-of-sync issue across tracks after locate
X-Git-Tag: 6.0-pre0~74
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=e6576e29349da39c01064318b5672b4583178ba4;p=ardour.git

probable fix for out-of-sync issue across tracks after locate
---

diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index 98bb05f0d6..918761e537 100644
--- a/libs/ardour/disk_reader.cc
+++ b/libs/ardour/disk_reader.cc
@@ -283,8 +283,10 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
 
 		/* no need for actual disk data, just advance read pointer and return */
 
-		for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
-			(*chan)->buf->increment_read_ptr (playback_distance);
+		if (!still_locating) {
+			for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
+				(*chan)->buf->increment_read_ptr (playback_distance);
+			}
 		}
 
 		/* if monitoring disk but locating, put silence in the buffers */