Fix assert. Remove some debug output.

git-svn-id: svn://localhost/ardour2/branches/3.0@7833 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index e916fef263b9986de441286772e69d5a885723bf..52b93015c8278003ff86e7f3737f9605fe6f8494 100644 (file)
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -750,9 +750,6 @@ MidiDiskstream::read (framepos_t& start, nframes_t dur, bool reversed)
                                // Synthesize LoopEvent here, because the next events
                                // written will have non-monotonic timestamps.
                                _playback_buf->write(loop_end - 1, LoopEventType, sizeof (framepos_t), (uint8_t *) &loop_start);
-                               cout << "Pushing LoopEvent ts=" << loop_end-1
-                                    << " start+this_read " << start+this_read << endl;
-
                                start = loop_start;
                        } else {
                                start += this_read;

diff --git a/libs/ardour/midi_ring_buffer.cc b/libs/ardour/midi_ring_buffer.cc
index 4c89cbcf4c1f24fced5707506b8f61519d35caa3..eb83d4164511958e954ed07ad875aed398a259bc 100644 (file)
--- a/libs/ardour/midi_ring_buffer.cc
+++ b/libs/ardour/midi_ring_buffer.cc
@@ -27,7 +27,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-/** Read a block of MIDI events from buffer into a MidiBuffer.
+/** Read a block of MIDI events from this buffer into a MidiBuffer.
  *
  * Timestamps of events returned are relative to start (i.e. event with stamp 0
  * occurred at start), with offset added.
@@ -96,9 +96,7 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes
 
                // This event marks a loop end (i.e. the next event's timestamp will be non-monotonic)
                if (ev_type == LoopEventType) {
-                       cerr << "MRB loop boundary @ " << ev_time << endl;
-                       
-                       assert (ev_size == sizeof (nframes_t));
+                       assert (ev_size == sizeof (framepos_t));
                        nframes_t loop_start;
                        read_contents (ev_size, (uint8_t *) &loop_start);