summaryrefslogtreecommitdiff
path: root/libs/evoral/test
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-02-15 01:24:26 +0000
committerDavid Robillard <d@drobilla.net>2009-02-15 01:24:26 +0000
commit5a48f99f72c2e2f3ed313e00446dfdaa05dc5d56 (patch)
treec67b0c1a4da8dde5146e21b6699d15f389041e68 /libs/evoral/test
parentaefa9f0938d287c497878a6e29ce2f9e0bade7c5 (diff)
Use nframes_t for timestamps of real (jack) time MIDI events (i.e. in MidiBuffer and MidiRingBuffer).
Use iterator interface of Sequence to read events in a MIDISource rather than Sequence::read, avoiding timestamp confusion. Disable no longer useful Sequence::read. git-svn-id: svn://localhost/ardour2/branches/3.0@4570 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/evoral/test')
-rw-r--r--libs/evoral/test/SequenceTest.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp
index 7da171d10d..96cb3221bf 100644
--- a/libs/evoral/test/SequenceTest.cpp
+++ b/libs/evoral/test/SequenceTest.cpp
@@ -54,8 +54,11 @@ SequenceTest::preserveEventOrderingTest (void)
TestSink<Time> sink;
sink.writing.connect(sigc::mem_fun(&sink, &TestSink<Time>::assertLastEventTimeEarlier));
- seq->read(sink, 0, 1200, 0);
+
+ for (MySequence<Time>::const_iterator i = seq->begin(); i != seq->end(); ++i) {
+ sink.write(i->time(), i->event_type(), i->size(), i->buffer());
+ }
CPPUNIT_ASSERT_EQUAL(size_t(12), test_notes.size());
-
}
+