debug instrumentation for locate time

[ardour.git] / libs / ardour / disk_reader.cc

diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index 67e83cb1b818862e7c6468a77542ef9391c41626..918761e5371cb6812a3456d256bca5d838f7fc88 100644 (file)
--- a/libs/ardour/disk_reader.cc
+++ b/libs/ardour/disk_reader.cc
@@ -112,7 +112,7 @@ DiskReader::default_chunk_frames()
 bool
 DiskReader::set_name (string const & str)
 {
-       string my_name = X_("reader:");
+       string my_name = X_("playback:");
        my_name += str;
 
        if (_name != my_name) {
@@ -277,14 +277,16 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
        }
 
        BufferSet& scratch_bufs (_session.get_scratch_buffers (bufs.count()));
-       const bool still_locating = _session.locate_pending();
+       const bool still_locating = _session.global_locate_pending();
 
        if (!result_required || ((ms & MonitoringDisk) == 0) || still_locating) {
 
                /* 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 */