ardour/livetrax
13
0
Fork 0
Code

Fix assert. Remove some debug output.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7833 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-09-23 21:48:17 +00:00
parent 468d39ba81
commit cf4091a03a
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/ardour/midi_diskstream.cc
View File

@ -750,9 +750,6 @@ MidiDiskstream::read (framepos_t& start, nframes_t dur, bool reversed)
// Synthesize LoopEvent here, because the next events // Synthesize LoopEvent here, because the next events
// written will have non-monotonic timestamps. // written will have non-monotonic timestamps.
_playback_buf->write(loop_end - 1, LoopEventType, sizeof (framepos_t), (uint8_t *) &loop_start); _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; start = loop_start;
} else { } else {
start += this_read; start += this_read;

6
libs/ardour/midi_ring_buffer.cc
View File

@ -27,7 +27,7 @@ using namespace std;
using namespace ARDOUR; using namespace ARDOUR;
using namespace PBD; 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 * Timestamps of events returned are relative to start (i.e. event with stamp 0
* occurred at start), with offset added. * 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) // This event marks a loop end (i.e. the next event's timestamp will be non-monotonic)
if (ev_type == LoopEventType) { if (ev_type == LoopEventType) {
cerr << "MRB loop boundary @ " << ev_time << endl; assert (ev_size == sizeof (framepos_t));
assert (ev_size == sizeof (nframes_t));
nframes_t loop_start; nframes_t loop_start;
read_contents (ev_size, (uint8_t *) &loop_start); read_contents (ev_size, (uint8_t *) &loop_start);