From 3a6c9e3bb982b1cad8cfbcac2b1c906ddac1e7b6 Mon Sep 17 00:00:00 2001 From: Colin Fletcher Date: Mon, 24 Nov 2014 15:10:50 +0000 Subject: Fix build of evoral tests Fix compile errors in libs/evoral/test/, by explicitly calling Evoral::MusicalTime::to_double() wherever a double value is required of a MusicalTime. Some of the double variables should probably really be made into MusicalTime ones instead, but I don't want to mess with this too much. takeFiveTest still fails for me after this, but a failing test is probably more informative in the long run than a test that won't even compile. --- libs/evoral/test/SequenceTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/evoral/test') diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp index 32af5098a8..d56235657b 100644 --- a/libs/evoral/test/SequenceTest.cpp +++ b/libs/evoral/test/SequenceTest.cpp @@ -30,8 +30,8 @@ SequenceTest::preserveEventOrderingTest () ); event->buffer()[0] = MIDI_CMD_CONTROL; - event->buffer()[1] = event->time() / 1000; - event->buffer()[2] = event->time() / 1000; + event->buffer()[1] = event->time().to_double() / 1000; + event->buffer()[2] = event->time().to_double() / 1000; boost::shared_ptr > event_ptr(event); -- cgit v1.2.3