diff options
author | Carl Hetherington <carl@carlh.net> | 2010-07-25 00:39:04 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-07-25 00:39:04 +0000 |
commit | 963bc50a8b671f2c10f95c07aef37afd81f36445 (patch) | |
tree | da5fee15626d046b038d87ea9f89f89cc64eb611 /libs/evoral/test | |
parent | c685724c8067fc9308c5f66f1b91d445509159e9 (diff) |
Fix up evoral test suite.
git-svn-id: svn://localhost/ardour2/branches/3.0@7483 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/evoral/test')
-rw-r--r-- | libs/evoral/test/SMFTest.cpp | 2 | ||||
-rw-r--r-- | libs/evoral/test/SMFTest.hpp | 3 | ||||
-rw-r--r-- | libs/evoral/test/SequenceTest.cpp | 10 |
3 files changed, 8 insertions, 7 deletions
diff --git a/libs/evoral/test/SMFTest.cpp b/libs/evoral/test/SMFTest.cpp index 9bc6c639d9..2f306e9ebc 100644 --- a/libs/evoral/test/SMFTest.cpp +++ b/libs/evoral/test/SMFTest.cpp @@ -42,7 +42,7 @@ SMFTest::takeFiveTest () // make ev.time absolute time in frames ev.time() = time * frames_per_beat / (double)smf.ppqn(); ev.set_event_type(type_map->midi_event_type(buf[0])); - seq->append(ev); + seq->append(ev, next_event_id ()); } } diff --git a/libs/evoral/test/SMFTest.hpp b/libs/evoral/test/SMFTest.hpp index 1dbceee6ab..9b5d2d54e3 100644 --- a/libs/evoral/test/SMFTest.hpp +++ b/libs/evoral/test/SMFTest.hpp @@ -40,7 +40,8 @@ public: } int read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const { - return SMF::read_event(delta_t, size, buf); + event_id_t id; + return SMF::read_event(delta_t, size, buf, &id); } private: diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp index 2c5c17f4d8..e0ea71fd73 100644 --- a/libs/evoral/test/SequenceTest.cpp +++ b/libs/evoral/test/SequenceTest.cpp @@ -29,21 +29,21 @@ SequenceTest::preserveEventOrderingTest () ); event->buffer()[0] = MIDI_CMD_CONTROL; - event->buffer()[1] = event->time() / 100; - event->buffer()[2] = event->time() / 100; + event->buffer()[1] = event->time() / 1000; + event->buffer()[2] = event->time() / 1000; boost::shared_ptr<Event<Time> > event_ptr(event); - seq->append((*i)->on_event()); + seq->append((*i)->on_event(), next_event_id ()); inserted_events.push_back( boost::shared_ptr<Event<Time> >( new Event<Time>((*i)->on_event(), true) )); - seq->append(*event_ptr); + seq->append(*event_ptr, next_event_id ()); inserted_events.push_back(event_ptr); - seq->append((*i)->off_event()); + seq->append((*i)->off_event(), next_event_id ()); inserted_events.push_back( boost::shared_ptr<Event<Time> >( new Event<Time>((*i)->off_event(), true) |