Wrap MusicalTime in a class.

[ardour.git] / libs / ardour / test / framepos_minus_beats_test.cc

diff --git a/libs/ardour/test/framepos_minus_beats_test.cc b/libs/ardour/test/framepos_minus_beats_test.cc
index 01bafc1606f4d77f5f76c5268549ca3bc6d027de..e4c48441466d64870710a2f9eaba95c3144b8a19 100644 (file)
--- a/libs/ardour/test/framepos_minus_beats_test.cc
+++ b/libs/ardour/test/framepos_minus_beats_test.cc
@@ -7,6 +7,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION (FrameposMinusBeatsTest);
 using namespace std;
 using namespace ARDOUR;
 using namespace Timecode;
+using namespace Evoral;
 
 /* Basic tests with no tempo / meter changes */
 void
@@ -25,11 +26,11 @@ FrameposMinusBeatsTest::singleTempoTest ()
        map.add_tempo (tempo, BBT_Time (1, 1, 0));
 
        /* Subtract 1 beat from beat 3 of the first bar */
-       framepos_t r = map.framepos_minus_beats (frames_per_beat * 2, 1);
+       framepos_t r = map.framepos_minus_beats (frames_per_beat * 2, MusicalTime(1));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (frames_per_beat * 1));
 
        /* Subtract 4 beats from 3 beats in, to go beyond zero */
-       r = map.framepos_minus_beats (frames_per_beat * 3, 4);
+       r = map.framepos_minus_beats (frames_per_beat * 3, MusicalTime(4));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (- frames_per_beat));
 }
 
@@ -69,15 +70,15 @@ FrameposMinusBeatsTest::doubleTempoTest ()
        /* Now some tests */
 
        /* Subtract 1 beat from 1|2 */
-       framepos_t r = map.framepos_minus_beats (24e3, 1);
+       framepos_t r = map.framepos_minus_beats (24e3, MusicalTime(1));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (0));
 
        /* Subtract 2 beats from 4|2 (over the tempo change) */
-       r = map.framepos_minus_beats (288e3 + 12e3, 2);
+       r = map.framepos_minus_beats (288e3 + 12e3, MusicalTime(2));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (288e3 - 24e3));
 
        /* Subtract 2.5 beats from 4|2 (over the tempo change) */
-       r = map.framepos_minus_beats (288e3 + 12e3, 2.5);
+       r = map.framepos_minus_beats (288e3 + 12e3, MusicalTime(2.5));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (288e3 - 24e3 - 12e3));
 }
 
@@ -123,15 +124,15 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest ()
        /* Now some tests */
 
        /* Subtract 1 beat from 1|2 */
-       framepos_t r = map.framepos_minus_beats (24e3, 1);
+       framepos_t r = map.framepos_minus_beats (24e3, MusicalTime(1));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (0));
 
        /* Subtract 2 beats from 4|2 (over the tempo change) */
-       r = map.framepos_minus_beats (288e3 + 12e3, 2);
+       r = map.framepos_minus_beats (288e3 + 12e3, MusicalTime(2));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (288e3 - 24e3));
 
        /* Subtract 2.5 beats from 4|2 (over the tempo change) */
-       r = map.framepos_minus_beats (288e3 + 12e3, 2.5);
+       r = map.framepos_minus_beats (288e3 + 12e3, MusicalTime(2.5));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (288e3 - 24e3 - 12e3));
 }