add display name to processors (so that it can differ from the "real name"); pay...

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

diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index fcbf18772110b685423d3009138b74fd8fffea15..29357322ead5b2dc69d9dcccacbf523d23acf4b5 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,14 +116,27 @@ 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<nframes_t>& 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<nframes_t>& 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);
 }
@@ -131,9 +144,6 @@ MidiRegion::master_read_at (MidiRingBuffer<nframes_t>& out, nframes_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
 {
-       /*cerr << "MidiRegion " << _name << "._read_at(" << position << ") - "
-               << position << " duration: " << dur << endl;*/
-
        nframes_t internal_offset = 0;
        nframes_t src_offset      = 0;
        nframes_t to_read         = 0;
@@ -155,7 +165,6 @@ MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer<nframes_t>& dst, nf
                return 0; /* read nothing */
        }
        
-
        if ((to_read = min (dur, _length - internal_offset)) == 0) {
                return 0; /* read nothing */
        }
@@ -184,16 +193,12 @@ MidiRegion::_read_at (const SourceList& srcs, MidiRingBuffer<nframes_t>& dst, nf
        }
        
        if (src->midi_read (
-                       // the destination buffer
-                       dst,  
-                       // where to start reading in the region
-                       _start + internal_offset, 
-                       // how many bytes
-                       to_read, 
-                       // the offset in the output buffer
-                       output_buffer_position,
-                       // what to substract from note times written in the output buffer
-                       negative_output_buffer_position
+                       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" */
        }