merge with master

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

diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp
index b0313ffd1b8b7216b222d85e54802f7fda2494c0..69931b8e0d221afbd438b0926d9ffe188bb17cd4 100644 (file)
--- a/libs/evoral/test/SequenceTest.cpp
+++ b/libs/evoral/test/SequenceTest.cpp
@@ -77,12 +77,12 @@ SequenceTest::iteratorSeekTest ()
        bool on = true;
        for (Sequence<Time>::const_iterator i = seq->begin(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 +109,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);