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 ababd41a8d29e078a3e16952b5bde4ad1306a035..aca8d039ad218b01f3268e50a84cc5510439afb5 100644 (file)
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -29,18 +29,18 @@
 
 #include <glibmm/thread.h>
 
-#include <pbd/basename.h>
-#include <pbd/xml++.h>
-#include <pbd/enumwriter.h>
-
-#include <ardour/midi_region.h>
-#include <ardour/session.h>
-#include <ardour/gain.h>
-#include <ardour/dB.h>
-#include <ardour/playlist.h>
-#include <ardour/midi_source.h>
-#include <ardour/types.h>
-#include <ardour/midi_ring_buffer.h>
+#include "pbd/basename.h"
+#include "pbd/xml++.h"
+#include "pbd/enumwriter.h"
+
+#include "ardour/midi_region.h"
+#include "ardour/session.h"
+#include "ardour/gain.h"
+#include "ardour/dB.h"
+#include "ardour/playlist.h"
+#include "ardour/midi_source.h"
+#include "ardour/types.h"
+#include "ardour/midi_ring_buffer.h"
 
 #include "i18n.h"
 #include <locale.h>
@@ -116,27 +116,38 @@ MidiRegion::~MidiRegion ()
 {
 }
 
+void
+MidiRegion::set_position_internal (nframes_t pos, bool allow_bbt_recompute)
+{
+       BeatsFramesConverter old_converter(_session, _position - _start);
+       double length_beats = old_converter.from(_length);
+
+       Region::set_position_internal(pos, allow_bbt_recompute);
+       
+       BeatsFramesConverter new_converter(_session, pos - _start);
+
+       set_length(new_converter.to(length_beats), 0);
+}
+
 nframes_t
-MidiRegion::read_at (MidiRingBuffer& out, nframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const
+MidiRegion::read_at (MidiRingBuffer<nframes_t>& out, sframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const
 {
        return _read_at (_sources, out, position, dur, chan_n, mode);
 }
 
 nframes_t
-MidiRegion::master_read_at (MidiRingBuffer& out, nframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const
+MidiRegion::master_read_at (MidiRingBuffer<nframes_t>& out, sframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const
 {
        return _read_at (_master_sources, out, position, dur, chan_n, mode);
 }
 
 nframes_t
-MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer& 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
 {
-       // cerr << _name << "._read_at(" << position << ") - " << _position << endl;
-
        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);
@@ -154,7 +165,6 @@ MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer& dst, nframes_t pos
                return 0; /* read nothing */
        }
        
-
        if ((to_read = min (dur, _length - internal_offset)) == 0) {
                return 0; /* read nothing */
        }
@@ -171,7 +181,34 @@ MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer& dst, nframes_t pos
        boost::shared_ptr<MidiSource> src = midi_source(chan_n);
        src->set_note_mode(mode);
 
-       if (src->midi_read (dst, _start + internal_offset, to_read, _position) != to_read) {
+       nframes_t output_buffer_position = 0;
+       nframes_t negative_output_buffer_position = 0;
+       if (_position >= _start) {
+               // handle resizing of beginnings of regions correctly
+               output_buffer_position = _position - _start;
+       } else {
+               // when _start is greater than _position, we have to subtract
+               // _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
+                       _start + internal_offset, // where to start reading in the source
+                       to_read, // read duration in frames
+                       output_buffer_position, // the offset in the output buffer
+                       negative_output_buffer_position // amount to substract from note times
+               ) != to_read) {
                return 0; /* "read nothing" */
        }
 
@@ -280,33 +317,9 @@ MidiRegion::recompute_at_start ()
 }
 
 int
-MidiRegion::separate_by_channel (Session& session, vector<MidiRegion*>& v) const
+MidiRegion::separate_by_channel (ARDOUR::Session&, vector< boost::shared_ptr<Region> >&) const
 {
-       // Separate by MIDI channel?  bit different from audio since this is separating based
-       // on the actual contained data and destructively modifies and creates new sources..
-       
-#if 0
-       SourceList srcs;
-       string new_name;
-
-       for (SourceList::const_iterator i = _master_sources.begin(); i != _master_sources.end(); ++i) {
-
-               srcs.clear ();
-               srcs.push_back (*i);
-
-               /* generate a new name */
-               
-               if (session.region_name (new_name, _name)) {
-                       return -1;
-               }
-
-               /* create a copy with just one source */
-
-               v.push_back (new MidiRegion (srcs, _start, _length, new_name, _layer, _flags));
-       }
-#endif
-
-       // Actually, I would prefer not if that's alright
+       // TODO
        return -1;
 }