diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-24 12:03:54 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-24 12:03:54 -0400 |
| commit | 7db12f6b128eef0d63dd6a8eda3d04f4dab1fc79 (patch) | |
| tree | 388aecd96220df899626709aeb8c7dbc37fd9088 /libs/ardour/test/samplepos_plus_beats_test.cc | |
| parent | 9283bee867ce788465f3e48ed889cd324e098e64 (diff) | |
convert codebase to use Temporal for various time types
Diffstat (limited to 'libs/ardour/test/samplepos_plus_beats_test.cc')
| -rw-r--r-- | libs/ardour/test/samplepos_plus_beats_test.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libs/ardour/test/samplepos_plus_beats_test.cc b/libs/ardour/test/samplepos_plus_beats_test.cc index d567f4691c..4529e34899 100644 --- a/libs/ardour/test/samplepos_plus_beats_test.cc +++ b/libs/ardour/test/samplepos_plus_beats_test.cc @@ -1,6 +1,6 @@ #include "samplepos_plus_beats_test.h" #include "ardour/tempo.h" -#include "timecode/bbt_time.h" +#include "temporal/bbt_time.h" CPPUNIT_TEST_SUITE_REGISTRATION (FrameposPlusBeatsTest); @@ -25,11 +25,11 @@ FrameposPlusBeatsTest::singleTempoTest () map.replace_tempo (map.first_tempo(), tempo, 0.0, 0, AudioTime); /* Add 1 beat to beat 3 of the first bar */ - samplepos_t r = map.samplepos_plus_qn (samples_per_beat * 2, Evoral::Beats(1)); + samplepos_t r = map.samplepos_plus_qn (samples_per_beat * 2, Temporal::Beats(1)); CPPUNIT_ASSERT_EQUAL (samplepos_t (samples_per_beat * 3), r); /* Add 4 beats to a -ve sample of 1 beat before zero */ - r = map.samplepos_plus_qn (-samples_per_beat * 1, Evoral::Beats(4)); + r = map.samplepos_plus_qn (-samples_per_beat * 1, Temporal::Beats(4)); CPPUNIT_ASSERT_EQUAL (samplepos_t (samples_per_beat * 3), r); } @@ -70,15 +70,15 @@ FrameposPlusBeatsTest::doubleTempoTest () /* Now some tests */ /* Add 1 beat to 1|2 */ - samplepos_t r = map.samplepos_plus_qn (24e3, Evoral::Beats(1)); + samplepos_t r = map.samplepos_plus_qn (24e3, Temporal::Beats(1)); CPPUNIT_ASSERT_EQUAL (samplepos_t (48e3), r); /* Add 2 beats to 3|4 (over the tempo change) */ - r = map.samplepos_plus_qn (264e3, Evoral::Beats(2)); + r = map.samplepos_plus_qn (264e3, Temporal::Beats(2)); CPPUNIT_ASSERT_EQUAL (samplepos_t (264e3 + 24e3 + 12e3), r); /* Add 2.5 beats to 3|3|960 (over the tempo change) */ - r = map.samplepos_plus_qn (264e3 - 12e3, Evoral::Beats(2.5)); + r = map.samplepos_plus_qn (264e3 - 12e3, Temporal::Beats(2.5)); CPPUNIT_ASSERT_EQUAL (samplepos_t (264e3 + 24e3 + 12e3), r); } @@ -125,15 +125,15 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest () /* Now some tests */ /* Add 1 beat to 1|2 */ - samplepos_t r = map.samplepos_plus_qn (24e3, Evoral::Beats(1)); + samplepos_t r = map.samplepos_plus_qn (24e3, Temporal::Beats(1)); CPPUNIT_ASSERT_EQUAL (samplepos_t (48e3), r); /* Add 2 beats to 3|4 (over the tempo change) */ - r = map.samplepos_plus_qn (264e3, Evoral::Beats(2)); + r = map.samplepos_plus_qn (264e3, Temporal::Beats(2)); CPPUNIT_ASSERT_EQUAL (samplepos_t (264e3 + 24e3 + 12e3), r); /* Add 2.5 beats to 3|3|960 (over the tempo change) */ - r = map.samplepos_plus_qn (264e3 - 12e3, Evoral::Beats(2.5)); + r = map.samplepos_plus_qn (264e3 - 12e3, Temporal::Beats(2.5)); CPPUNIT_ASSERT_EQUAL (samplepos_t (264e3 + 24e3 + 12e3), r); } @@ -181,15 +181,15 @@ FrameposPlusBeatsTest::doubleTempoWithComplexMeterTest () /* Now some tests */ /* Add 1 beat to 1|2 */ - samplepos_t r = map.samplepos_plus_qn (24e3, Evoral::Beats(1)); + samplepos_t r = map.samplepos_plus_qn (24e3, Temporal::Beats(1)); CPPUNIT_ASSERT_EQUAL (samplepos_t (48e3), r); /* Add 2 beats to 5|1 (over the tempo change) */ - r = map.samplepos_plus_qn (264e3, Evoral::Beats(2)); + r = map.samplepos_plus_qn (264e3, Temporal::Beats(2)); CPPUNIT_ASSERT_EQUAL (samplepos_t (264e3 + 24e3 + 12e3), r); /* Add 2.5 beats to 4|5 (over the tempo change) */ - r = map.samplepos_plus_qn (264e3 - 12e3, Evoral::Beats(2.5)); + r = map.samplepos_plus_qn (264e3 - 12e3, Temporal::Beats(2.5)); CPPUNIT_ASSERT_EQUAL (samplepos_t (264e3 + 24e3 + 12e3), r); } |