Optimize automation-event process splitting

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

diff --git a/libs/ardour/midi_ring_buffer.cc b/libs/ardour/midi_ring_buffer.cc
index d8479988d5e805ca5f2f7a67ef68a1bf33ef28af..3b8f6fc39e10903e27a420342573f122f4e1c5c2 100644 (file)
--- a/libs/ardour/midi_ring_buffer.cc
+++ b/libs/ardour/midi_ring_buffer.cc
@@ -37,7 +37,7 @@ namespace ARDOUR {
  */
 template<typename T>
 size_t
-MidiRingBuffer<T>::read (MidiBuffer& dst, framepos_t start, framepos_t end, framecnt_t offset, bool stop_on_overflow_in_dst)
+MidiRingBuffer<T>::read (MidiBuffer& dst, samplepos_t start, samplepos_t end, samplecnt_t offset, bool stop_on_overflow_in_dst)
 {
        if (this->read_space() == 0) {
                return 0;
@@ -105,7 +105,7 @@ MidiRingBuffer<T>::read (MidiBuffer& dst, framepos_t start, framepos_t end, fram
 #ifndef NDEBUG
                if (DEBUG_ENABLED (DEBUG::MidiRingBuffer)) {
                        DEBUG_STR_DECL(a);
-                       DEBUG_STR_APPEND(a, string_compose ("wrote MidiEvent to Buffer (time=%1, start=%2 offset=%3)", ev_time, start, offset));
+                       DEBUG_STR_APPEND(a, string_compose ("wrote MidiEvent to Buffer (time=%1, start=%2 offset=%3) ", ev_time, start, offset));
                        for (size_t i=0; i < ev_size; ++i) {
                                DEBUG_STR_APPEND(a,hex);
                                DEBUG_STR_APPEND(a,"0x");
@@ -129,7 +129,7 @@ MidiRingBuffer<T>::read (MidiBuffer& dst, framepos_t start, framepos_t end, fram
 
 template<typename T>
 size_t
-MidiRingBuffer<T>::skip_to(framepos_t start)
+MidiRingBuffer<T>::skip_to(samplepos_t start)
 {
        if (this->read_space() == 0) {
                return 0;
@@ -194,7 +194,7 @@ MidiRingBuffer<T>::skip_to(framepos_t start)
 
 template<typename T>
 void
-MidiRingBuffer<T>::flush (framepos_t /*start*/, framepos_t end)
+MidiRingBuffer<T>::flush (samplepos_t /*start*/, samplepos_t end)
 {
        const size_t prefix_size = sizeof(T) + sizeof(Evoral::EventType) + sizeof(uint32_t);
 
@@ -309,18 +309,18 @@ MidiRingBuffer<T>::reset_tracker ()
 
 template<typename T>
 void
-MidiRingBuffer<T>::resolve_tracker (MidiBuffer& dst, framepos_t t)
+MidiRingBuffer<T>::resolve_tracker (MidiBuffer& dst, samplepos_t t)
 {
        _tracker.resolve_notes (dst, t);
 }
 
 template<typename T>
 void
-MidiRingBuffer<T>::resolve_tracker (Evoral::EventSink<framepos_t>& dst, framepos_t t)
+MidiRingBuffer<T>::resolve_tracker (Evoral::EventSink<samplepos_t>& dst, samplepos_t t)
 {
        _tracker.resolve_notes(dst, t);
 }
 
-template class MidiRingBuffer<framepos_t>;
+template class MidiRingBuffer<samplepos_t>;
 
 }  // namespace ARDOUR