diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-09-23 21:48:17 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-09-23 21:48:17 +0000 |
| commit | cf4091a03a32fea23f215279af8f527ea7fa6cec (patch) | |
| tree | 2e4e465227e71a99ffc6292a129737bd0c8321b0 /libs | |
| parent | 468d39ba81fa73e9051910f69d09ced8654b97d7 (diff) | |
Fix assert. Remove some debug output.
git-svn-id: svn://localhost/ardour2/branches/3.0@7833 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/midi_diskstream.cc | 3 | ||||
| -rw-r--r-- | libs/ardour/midi_ring_buffer.cc | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index e916fef263..52b93015c8 100644 --- 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 4c89cbcf4c..eb83d41645 100644 --- 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); |