MusicalTime => Beats.

2 files changed, 16 insertions, 16 deletions

diff --git a/libs/ardour/test/framepos_minus_beats_test.cc b/libs/ardour/test/framepos_minus_beats_test.cc
index e4c4844146..cc6341fb0b 100644
--- a/libs/ardour/test/framepos_minus_beats_test.cc
+++ b/libs/ardour/test/framepos_minus_beats_test.cc
@@ -26,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, MusicalTime(1));
+	framepos_t r = map.framepos_minus_beats (frames_per_beat * 2, Beats(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, MusicalTime(4));
+	r = map.framepos_minus_beats (frames_per_beat * 3, Beats(4));
 	CPPUNIT_ASSERT_EQUAL (r, framepos_t (- frames_per_beat));
 }
 
@@ -70,15 +70,15 @@ FrameposMinusBeatsTest::doubleTempoTest ()
 	/* Now some tests */
 
 	/* Subtract 1 beat from 1|2 */
-	framepos_t r = map.framepos_minus_beats (24e3, MusicalTime(1));
+	framepos_t r = map.framepos_minus_beats (24e3, Beats(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, MusicalTime(2));
+	r = map.framepos_minus_beats (288e3 + 12e3, Beats(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, MusicalTime(2.5));
+	r = map.framepos_minus_beats (288e3 + 12e3, Beats(2.5));
 	CPPUNIT_ASSERT_EQUAL (r, framepos_t (288e3 - 24e3 - 12e3));
 }
 
@@ -124,15 +124,15 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest ()
 	/* Now some tests */
 
 	/* Subtract 1 beat from 1|2 */
-	framepos_t r = map.framepos_minus_beats (24e3, MusicalTime(1));
+	framepos_t r = map.framepos_minus_beats (24e3, Beats(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, MusicalTime(2));
+	r = map.framepos_minus_beats (288e3 + 12e3, Beats(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, MusicalTime(2.5));
+	r = map.framepos_minus_beats (288e3 + 12e3, Beats(2.5));
 	CPPUNIT_ASSERT_EQUAL (r, framepos_t (288e3 - 24e3 - 12e3));
 }
 
diff --git a/libs/ardour/test/framepos_plus_beats_test.cc b/libs/ardour/test/framepos_plus_beats_test.cc
index abe1310f62..efc57c5872 100644
--- a/libs/ardour/test/framepos_plus_beats_test.cc
+++ b/libs/ardour/test/framepos_plus_beats_test.cc
@@ -25,11 +25,11 @@ FrameposPlusBeatsTest::singleTempoTest ()
 	map.add_tempo (tempo, BBT_Time (1, 1, 0));
 
 	/* Add 1 beat to beat 3 of the first bar */
-	framepos_t r = map.framepos_plus_beats (frames_per_beat * 2, Evoral::MusicalTime(1));
+	framepos_t r = map.framepos_plus_beats (frames_per_beat * 2, Evoral::Beats(1));
 	CPPUNIT_ASSERT_EQUAL (framepos_t (frames_per_beat * 3), r);
 
 	/* Add 4 beats to a -ve frame of 1 beat before zero */
-	r = map.framepos_plus_beats (-frames_per_beat * 1, Evoral::MusicalTime(4));
+	r = map.framepos_plus_beats (-frames_per_beat * 1, Evoral::Beats(4));
 	CPPUNIT_ASSERT_EQUAL (framepos_t (frames_per_beat * 3), r);
 }
 
@@ -69,15 +69,15 @@ FrameposPlusBeatsTest::doubleTempoTest ()
 	/* Now some tests */
 
 	/* Add 1 beat to 1|2 */
-	framepos_t r = map.framepos_plus_beats (24e3, Evoral::MusicalTime(1));
+	framepos_t r = map.framepos_plus_beats (24e3, Evoral::Beats(1));
 	CPPUNIT_ASSERT_EQUAL (framepos_t (48e3), r);
 
 	/* Add 2 beats to 3|4 (over the tempo change) */
-	r = map.framepos_plus_beats (264e3, Evoral::MusicalTime(2));
+	r = map.framepos_plus_beats (264e3, Evoral::Beats(2));
 	CPPUNIT_ASSERT_EQUAL (framepos_t (264e3 + 24e3 + 12e3), r);
 
 	/* Add 2.5 beats to 3|3|960 (over the tempo change) */
-	r = map.framepos_plus_beats (264e3 - 12e3, Evoral::MusicalTime(2.5));
+	r = map.framepos_plus_beats (264e3 - 12e3, Evoral::Beats(2.5));
 	CPPUNIT_ASSERT_EQUAL (framepos_t (264e3 + 24e3 + 12e3), r);
 }
 
@@ -123,15 +123,15 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest ()
 	/* Now some tests */
 
 	/* Add 1 beat to 1|2 */
-	framepos_t r = map.framepos_plus_beats (24e3, Evoral::MusicalTime(1));
+	framepos_t r = map.framepos_plus_beats (24e3, Evoral::Beats(1));
 	CPPUNIT_ASSERT_EQUAL (framepos_t (48e3), r);
 
 	/* Add 2 beats to 3|4 (over the tempo change) */
-	r = map.framepos_plus_beats (264e3, Evoral::MusicalTime(2));
+	r = map.framepos_plus_beats (264e3, Evoral::Beats(2));
 	CPPUNIT_ASSERT_EQUAL (framepos_t (264e3 + 24e3 + 12e3), r);
 
 	/* Add 2.5 beats to 3|3|960 (over the tempo change) */
-	r = map.framepos_plus_beats (264e3 - 12e3, Evoral::MusicalTime(2.5));
+	r = map.framepos_plus_beats (264e3 - 12e3, Evoral::Beats(2.5));
 	CPPUNIT_ASSERT_EQUAL (framepos_t (264e3 + 24e3 + 12e3), r);
 }