Wrap MusicalTime in a class.

[ardour.git] / libs / evoral / test / SequenceTest.cpp

diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp
index 2573d8416d51c46a50c85e641bf2fa6170e3173e..32af5098a8d06d75e55bfa9d7f7ac945bb67cff6 100644 (file)
--- a/libs/evoral/test/SequenceTest.cpp
+++ b/libs/evoral/test/SequenceTest.cpp
@@ -5,6 +5,7 @@
 CPPUNIT_TEST_SUITE_REGISTRATION(SequenceTest);
 
 using namespace std;
+using namespace Evoral;
 
 void
 SequenceTest::createTest ()
@@ -23,7 +24,7 @@ SequenceTest::preserveEventOrderingTest ()
        seq->start_write();
 
        for (Notes::const_iterator i = test_notes.begin(); i != test_notes.end(); ++i) {
-               uint8_t buffer[2];
+               uint8_t buffer[3];
                Event<Time>* event = new Event<Time>(
                                DummyTypeMap::CONTROL, (*i)->on_event().time(), 3, buffer, true
                );
@@ -50,7 +51,7 @@ SequenceTest::preserveEventOrderingTest ()
                ));
        }
 
-       seq->end_write();
+       seq->end_write (Sequence<Time>::Relax);
 
        TestSink<Time> sink;
        sink.writing.connect(sigc::mem_fun(&sink, &TestSink<Time>::assertLastEventTimeEarlier));
@@ -75,14 +76,14 @@ SequenceTest::iteratorSeekTest ()
        }
 
        bool on = true;
-       for (Sequence<Time>::const_iterator i = seq->begin(600); i != seq->end(); ++i) {
+       for (Sequence<Time>::const_iterator i = seq->begin(Evoral::MusicalTime(600)); i != seq->end(); ++i) {
                if (on) {
-                       CPPUNIT_ASSERT(((MIDIEvent<Time>&)*i).is_note_on());
+                       CPPUNIT_ASSERT(((const MIDIEvent<Time>&)*i).is_note_on());
                        CPPUNIT_ASSERT_EQUAL(i->time(), Time((num_notes + 6) * 100));
                        ++num_notes;
                        on = false;
                } else {
-                       CPPUNIT_ASSERT(((MIDIEvent<Time>&)*i).is_note_off());
+                       CPPUNIT_ASSERT(((const MIDIEvent<Time>&)*i).is_note_off());
                        on = true;
                }
        }
@@ -109,9 +110,9 @@ SequenceTest::controlInterpolationTest ()
        MIDI::controller_range(min, max, normal);
 
        // Make a ramp like /\ from min to max and back to min
-       c->set_double(min, true, 0);
-       c->set_double(max, true, delay);
-       c->set_double(min, true, 2*delay);
+       c->set_double(min, 0, true);
+       c->set_double(max, delay, true);
+       c->set_double(min, 2*delay, true);
 
        CCTestSink<Time> sink(cc_type);
 
@@ -136,7 +137,7 @@ SequenceTest::controlInterpolationTest ()
                sink.write(i->time(), i->event_type(), i->size(), i->buffer());
        }
        CPPUNIT_ASSERT(sink.events.size() == 128 * 2 - 1);
-       Time    last_time  = 0;
+       Time    last_time(0);
        int16_t last_value = -1;
        bool    ascending  = true;
        for (CCTestSink<Time>::Events::const_iterator i = sink.events.begin();