X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fevoral%2Ftest%2FSequenceTest.cpp;h=69931b8e0d221afbd438b0926d9ffe188bb17cd4;hb=37b1f5017e904005fae6b815b1519b3fa595d8d3;hp=e0ea71fd730204b4a50ed1a1f02ebb6931616041;hpb=963bc50a8b671f2c10f95c07aef37afd81f36445;p=ardour.git

diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp
index e0ea71fd73..69931b8e0d 100644
--- a/libs/evoral/test/SequenceTest.cpp
+++ b/libs/evoral/test/SequenceTest.cpp
@@ -50,7 +50,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));
@@ -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;
 		}
 	}
@@ -99,8 +99,8 @@ SequenceTest::controlInterpolationTest ()
 		seq->notes().insert(*i);
 	}
 
-	static const FrameTime delay   = 1000;
-	static const uint32_t  cc_type = 1;
+	static const uint64_t delay   = 1000;
+	static const uint32_t cc_type = 1;
 
 	boost::shared_ptr<Control> c = seq->control(MIDI::ContinuousController(cc_type, 1, 1), true);
 	CPPUNIT_ASSERT(c);
@@ -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_float(min, true, 0);
-	c->set_float(max, true, delay);
-	c->set_float(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);