diff options
| author | David Robillard <d@drobilla.net> | 2015-01-07 00:12:07 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2015-01-07 00:12:07 -0500 |
| commit | 2a251b457069ffb4b744fbd0dd7aca7acb31f381 (patch) | |
| tree | 4311e63fe7ef1b5d7a5b841a4dd0eb7b26b324a7 /libs/ardour/test/framepos_plus_beats_test.cc | |
| parent | 4d202d9157bef5b6325fe54b7874080952f86a37 (diff) | |
MusicalTime => Beats.
Diffstat (limited to 'libs/ardour/test/framepos_plus_beats_test.cc')
| -rw-r--r-- | libs/ardour/test/framepos_plus_beats_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
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); } |