Remove unused method..

[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 e93ca51b2503124376779b5d35bb56d27e9a62e3..746dc3b3eba04eae46cc2b103cda47dd5f34b4c6 100644 (file)
--- a/libs/ardour/midi_ring_buffer.cc
+++ b/libs/ardour/midi_ring_buffer.cc
@@ -50,10 +50,10 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes
                this->full_peek(sizeof(T), (uint8_t*)&ev_time);
 
                if (ev_time > end) {
-                       //cerr << "MRB: PAST END (" << ev_time << " : " << end << ")" << endl;
+                       //cerr << "MRB event @ " << ev_time << " past end @ " << end << endl;
                        break;
                } else if (ev_time < start) {
-                       //cerr << "MRB (start " << start << ") - Skipping event at (too early) time " << ev_time << endl;
+                       //cerr << "MRB event @ " << ev_time << " before start @ " << start << endl;
                        break;
                }
 
@@ -63,16 +63,14 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes
                        continue;
                }
 
-               // This event marks a loop happening. this means that
-               // the next events timestamp will be non-monotonic.
+               // This event marks a loop end (i.e. the next event's timestamp will be non-monotonic)
                if (ev_type == LoopEventType) {
-                       ev_time -= start;
+                       /*ev_time -= start;
                        ev_time += offset;
-                       Evoral::MIDIEvent<T> loopevent(LoopEventType, ev_time); 
-                       dst.push_back(loopevent);
-                       
-                       // We can safely return, without reading the data, because
-                       // a LoopEvent does not have data.
+                       cerr << "MRB loop boundary @ " << ev_time << endl;*/
+
+                       // Return without reading data or writing to buffer (loop events have no data)
+                       // FIXME: This is not correct, loses events after the loop this cycle
                        return count + 1;
                }
 
@@ -83,22 +81,22 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes
                // Ignore event if it doesn't match channel filter
                if (is_channel_event(status) && get_channel_mode() == FilterChannels) {
                        const uint8_t channel = status & 0x0F;
-                       if ( !(get_channel_mask() & (1L << channel)) ) {
+                       if (!(get_channel_mask() & (1L << channel))) {
                                //cerr << "MRB skipping event due to channel mask" << endl;
                                this->skip(ev_size); // Advance read pointer to next event
                                continue;
                        }
                }
 
-               //cerr << "MRB " << this << " - Reading event, time = "
-               //      << ev_time << " - " << start << " => " << ev_time - start
-               //      << ", size = " << ev_size << endl;
+               /*cerr << "MRB " << this << " - Reading event, time = "
+                       << ev_time << " - " << start << " => " << ev_time - start
+                       << ", size = " << ev_size << endl;*/
 
                assert(ev_time >= start);
                ev_time -= start;
                ev_time += offset;
 
-               // this writes the timestamp to write_loc[0]
+               // write the timestamp to address (write_loc - 1)
                uint8_t* write_loc = dst.reserve(ev_time, ev_size);
                if (write_loc == NULL) {
                        cerr << "MRB: Unable to reserve space in buffer, event skipped";
@@ -108,30 +106,26 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes
                // write MIDI buffer contents
                success = Evoral::EventRingBuffer<T>::full_read(ev_size, write_loc);
                
-               cerr << "wrote MidiEvent to Buffer: ";
+               /*cerr << "wrote MidiEvent to Buffer: ";
                for (size_t i=0; i < ev_size; ++i) {
                        printf("%X ", write_loc[i]);
                }
-               printf("\n");
-
+               printf("\n");*/
 
                if (success) {
                        if (is_channel_event(status) && get_channel_mode() == ForceChannel) {
                                write_loc[0] = (write_loc[0] & 0xF0) | (get_channel_mask() & 0x0F);
                        }
                        ++count;
-                       //cerr << "MRB - read event at time " << ev_time << endl;
                } else {
                        cerr << "WARNING: error reading event contents from MIDI ring" << endl;
                }
        }
        
-       //cerr << "MTB read space: " << read_space() << endl;
-
        return count;
 }
 
-template class MidiRingBuffer<double>;
+template class MidiRingBuffer<nframes_t>;
 
 } // namespace ARDOUR