Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert

[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 824d3bad8436f829a567d0ae738c01256bea783f..4ad563eec9e9803dec3283ad4e5fbcc185c1830f 100644 (file)
--- a/libs/ardour/midi_ring_buffer.cc
+++ b/libs/ardour/midi_ring_buffer.cc
@@ -17,6 +17,7 @@
 */
 
 #include "pbd/compose.h"
+#include "pbd/error.h"
 
 #include "ardour/debug.h"
 #include "ardour/midi_ring_buffer.h"
@@ -48,7 +49,7 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
           to the MidiBuffer with adjusted times.  The situation is as follows:
 
           session frames----------------------------->
-          
+
                     |                            |                    |
                start_of_loop                   start              end_of_loop
 
@@ -100,43 +101,29 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
                } else {
                        DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB event @ %1 in range %2 .. %3\n", ev_time, start, end));
                }
-               
-               /* lets see if we are going to be able to write this event into dst.
-                */
 
                assert(ev_time >= start);
-               
+
                ev_time -= start;
                ev_time += offset;
 
-               // write the timestamp to address (write_loc - 1)
-               uint8_t* write_loc = dst.reserve(ev_time, ev_size);
-               if (write_loc == NULL) {
-                       if (stop_on_overflow_in_dst) {
-                               DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MidiRingBuffer: overflow in destination MIDI buffer, stopped after %1 events\n", count));
-                               break;
-                       }
-                       cerr << "MRB: Unable to reserve space in buffer, event skipped";
-                       this->increment_read_ptr (prefix_size + ev_size); // Advance read pointer to next event
-                       continue;
-               }
-
-               /* we're good to go ahead and read the data now but since we
-                * have the prefix data already, just skip over that
-                */
-
-               this->increment_read_ptr (prefix_size);
-
-               // This event marks a loop end (i.e. the next event's timestamp will be non-monotonic)
+               // This event marks a loop end (i.e. the next event's timestamp
+               // will be non-monotonic). Don't write it into the buffer - the
+               // significance of this event ends here.
+               
                if (ev_type == LoopEventType) {
                        assert (ev_size == sizeof (framepos_t));
                        framepos_t loop_start;
                        read_contents (ev_size, (uint8_t *) &loop_start);
-
                        loop_offset = ev_time - loop_start;
+                       _tracker.resolve_notes (dst, ev_time);
                        continue;
                }
 
+               /* we're good to go ahead and read the data now but since we
+                * have the prefix data already, just skip over that
+                */
+               this->increment_read_ptr (prefix_size);
                ev_time += loop_offset;
 
                uint8_t status;
@@ -147,12 +134,26 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
                if (is_channel_event(status) && get_channel_mode() == FilterChannels) {
                        const uint8_t channel = status & 0x0F;
                        if (!(get_channel_mask() & (1L << channel))) {
-                               // cerr << "MRB skipping event due to channel mask" << endl;
+                               DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB skipping event (%3 bytes) due to channel mask (mask = %1 chn = %2)\n",
+                                                                                     get_channel_mask(), (int) channel, ev_size));
                                this->increment_read_ptr (ev_size); // Advance read pointer to next event
                                continue;
                        }
                }
 
+               /* lets see if we are going to be able to write this event into dst.
+                */
+               uint8_t* write_loc = dst.reserve (ev_time, ev_size);
+               if (write_loc == 0) {
+                       if (stop_on_overflow_in_dst) {
+                               DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MidiRingBuffer: overflow in destination MIDI buffer, stopped after %1 events\n", count));
+                               break;
+                       }
+                       error << "MRB: Unable to reserve space in buffer, event skipped" << endmsg;
+                       this->increment_read_ptr (ev_size); // Advance read pointer to next event
+                       continue;
+               }
+
                // write MIDI buffer contents
                success = read_contents (ev_size, write_loc);
 
@@ -172,6 +173,13 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
 #endif
 
                if (success) {
+
+                       if (is_note_on(write_loc[0]) ) {
+                               _tracker.add (write_loc[1], write_loc[0] & 0xf);
+                       } else if (is_note_off(write_loc[0])) {
+                               _tracker.remove (write_loc[1], write_loc[0] & 0xf);
+                       }
+                       
                        if (is_channel_event(status) && get_channel_mode() == ForceChannel) {
                                write_loc[0] = (write_loc[0] & 0xF0) | (get_channel_mask() & 0x0F);
                        }
@@ -206,8 +214,8 @@ MidiRingBuffer<T>::dump(ostream& str)
                return;
        }
 
-       str << this << ": Dump size = " << vec.len[0] + vec.len[1] 
-           << " r@ " << RingBufferNPT<uint8_t>::get_read_ptr() 
+       str << this << ": Dump size = " << vec.len[0] + vec.len[1]
+           << " r@ " << RingBufferNPT<uint8_t>::get_read_ptr()
            << " w@" << RingBufferNPT<uint8_t>::get_write_ptr() << endl;
 
 
@@ -222,7 +230,7 @@ MidiRingBuffer<T>::dump(ostream& str)
        const uint8_t* end = buf + vec.len[0] + vec.len[1];
 
        while (data < end) {
-                
+
                memcpy (&ev_time, data, sizeof (T));
                data += sizeof (T);
                str << "\ttime " << ev_time;
@@ -262,5 +270,12 @@ MidiRingBuffer<T>::dump(ostream& str)
        delete [] buf;
 }
 
+template<typename T>
+void
+MidiRingBuffer<T>::reset_tracker ()
+{
+       _tracker.reset ();
+}
+
 template class MidiRingBuffer<framepos_t>;