When building with MSVC, allow for the fact that Mixbus and Ardour can be using diffe...

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

diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index 8421c04894441de3a49011256b47fd066f8738dd..4896a95af2af8943a2d271e8507035f5583d0fb7 100644 (file)
--- a/libs/ardour/disk_reader.cc
+++ b/libs/ardour/disk_reader.cc
@@ -366,12 +366,12 @@ DiskReader::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
 
                                        if (fabsf (speed) != 1.0f) {
                                                samplecnt_t ocnt = nframes;
-                                               samplecnt_t icnt = interpolation.interpolate (n, chaninfo->rw_vector.len[0], chaninfo->rw_vector.buf[0], ocnt, disk_signal);
+                                               interpolation.interpolate (n, chaninfo->rw_vector.len[0], chaninfo->rw_vector.buf[0], ocnt, disk_signal);
 
                                                if (ocnt < nframes) {
                                                        disk_signal += ocnt;
                                                        ocnt = nframes - ocnt;
-                                                       icnt = interpolation.interpolate (n, chaninfo->rw_vector.len[1], chaninfo->rw_vector.buf[1], ocnt, disk_signal);
+                                                       interpolation.interpolate (n, chaninfo->rw_vector.len[1], chaninfo->rw_vector.buf[1], ocnt, disk_signal);
                                                }
 
                                        } else if (speed != 0.0) {
@@ -402,8 +402,6 @@ DiskReader::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
 
                        chaninfo->buf->increment_read_ptr (disk_samples_to_consume);
 
-                 monitor_mix:
-
                        if (ms & MonitoringInput) {
                                /* mix the disk signal into the input signal (already in bufs) */
                                mix_buffers_no_gain (output.data(), disk_signal, disk_samples_to_consume);
@@ -758,7 +756,7 @@ DiskReader::audio_read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
                   just once.
                */
 
-               if ((loc = loop_location) != 0) {
+               if ((loc = _loop_location) != 0) {
                        loop_start = loc->start();
                        loop_end = loc->end();
                        loop_length = loop_end - loop_start;
@@ -1256,7 +1254,7 @@ DiskReader::get_midi_playback (MidiBuffer& dst, samplepos_t start_sample, sample
        if (ms & MonitoringDisk) {
                /* disk data needed */
 
-               Location* loc = loop_location;
+               Location* loc = _loop_location;
 
                DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose (
                                     "%1 MDS pre-read read %8 offset = %9 @ %4..%5 from %2 write to %3, LOOPED ? %6 .. %7\n", _name,
@@ -1381,7 +1379,7 @@ DiskReader::midi_read (samplepos_t& start, samplecnt_t dur, bool reversed)
        samplepos_t loop_end    = 0;
        samplepos_t loop_start  = 0;
        samplecnt_t loop_length = 0;
-       Location*  loc         = loop_location;
+       Location*  loc         = _loop_location;
        samplepos_t effective_start = start;
        Evoral::Range<samplepos_t>*  loop_range (0);