do not allow smf_source's reads to stomp on cached read_end position in parent class...

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

diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index 29357322ead5b2dc69d9dcccacbf523d23acf4b5..aca8d039ad218b01f3268e50a84cc5510439afb5 100644 (file)
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -142,12 +142,12 @@ MidiRegion::master_read_at (MidiRingBuffer<nframes_t>& out, sframes_t position,
 }
 
 nframes_t
-MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer<nframes_t>& dst, nframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const
+MidiRegion::_read_at (const SourceList& /*srcs*/, MidiRingBuffer<nframes_t>& dst, nframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const
 {
        nframes_t internal_offset = 0;
        nframes_t src_offset      = 0;
        nframes_t to_read         = 0;
-       
+
        /* precondition: caller has verified that we cover the desired section */
 
        assert(chan_n == 0);
@@ -191,7 +191,16 @@ MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer<nframes_t>& dst, nf
                // _start from the note times in the midi source
                negative_output_buffer_position = _start; 
        }
-       
+
+#if 0  
+       cerr << "\t\tsource read from " << _position << " - " << _start << " (" << _position - _start << ") "
+            << " start in source " << _start << " + " << internal_offset << " (" << _start + internal_offset << ") "
+            << " dur = " << to_read 
+            << " offset = " << output_buffer_position 
+            << " negoffset = " << negative_output_buffer_position 
+            << endl;
+#endif
+
        if (src->midi_read (
                        dst, // destination buffer
                        _position - _start, // start position of the source in this read context