diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-11-01 21:54:11 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-11-11 03:37:08 +1100 |
| commit | 594137f5cc5d641873b9002c28453166e81bac9e (patch) | |
| tree | 372b45608c4cb95e1d7a0fe4aa337e86e2deb793 /libs/ardour/test | |
| parent | 3db68b4f9e88658e8130769ee469f2a7b4de97a2 (diff) | |
remove public pulse methods from TempoMap.
- the only object whose musical position is not expressed in
quarter notes is MetricSection.
there is now no need to expose this.
Diffstat (limited to 'libs/ardour/test')
| -rw-r--r-- | libs/ardour/test/tempo_test.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libs/ardour/test/tempo_test.cc b/libs/ardour/test/tempo_test.cc index 30b20d3285..79fd0ee860 100644 --- a/libs/ardour/test/tempo_test.cc +++ b/libs/ardour/test/tempo_test.cc @@ -69,14 +69,14 @@ TempoTest::recomputeMapTest48 () /* pulse */ /* pulse - frame*/ - CPPUNIT_ASSERT_EQUAL (framepos_t (288e3), map.frame_at_pulse (3.0)); - CPPUNIT_ASSERT_EQUAL (framepos_t (144e3), map.frame_at_pulse (1.5)); - CPPUNIT_ASSERT_EQUAL (framepos_t (96e3), map.frame_at_pulse (1.0)); + CPPUNIT_ASSERT_EQUAL (framepos_t (288e3), map.frame_at_quarter_note (12.0)); + CPPUNIT_ASSERT_EQUAL (framepos_t (144e3), map.frame_at_quarter_note (6.0)); + CPPUNIT_ASSERT_EQUAL (framepos_t (96e3), map.frame_at_quarter_note (4.0)); /* frame - pulse*/ - CPPUNIT_ASSERT_DOUBLES_EQUAL (3.0, map.pulse_at_frame (288e3), 1e-17); - CPPUNIT_ASSERT_DOUBLES_EQUAL (1.5, map.pulse_at_frame (144e3), 1e-17); - CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, map.pulse_at_frame (96e3), 1e-17); + CPPUNIT_ASSERT_DOUBLES_EQUAL (12.0, map.quarter_note_at_frame (288e3), 1e-17); + CPPUNIT_ASSERT_DOUBLES_EQUAL (6.0, map.quarter_note_at_frame (144e3), 1e-17); + CPPUNIT_ASSERT_DOUBLES_EQUAL (4.0, map.quarter_note_at_frame (96e3), 1e-17); /* pulse - internal minute based interface */ CPPUNIT_ASSERT_DOUBLES_EQUAL (0.1, map.minute_at_pulse_locked (map._metrics, 3.0), 1e-17); @@ -170,14 +170,14 @@ TempoTest::recomputeMapTest44 () /* pulse */ /* pulse - frame*/ - CPPUNIT_ASSERT_EQUAL (framepos_t (264600), map.frame_at_pulse (3.0)); - CPPUNIT_ASSERT_EQUAL (framepos_t (132300), map.frame_at_pulse (1.5)); - CPPUNIT_ASSERT_EQUAL (framepos_t (88200), map.frame_at_pulse (1.0)); + CPPUNIT_ASSERT_EQUAL (framepos_t (264600), map.frame_at_quarter_note (12.0)); + CPPUNIT_ASSERT_EQUAL (framepos_t (132300), map.frame_at_quarter_note (6.0)); + CPPUNIT_ASSERT_EQUAL (framepos_t (88200), map.frame_at_quarter_note (4.0)); /* frame - pulse*/ - CPPUNIT_ASSERT_DOUBLES_EQUAL (3.0, map.pulse_at_frame (264600), 1e-17); - CPPUNIT_ASSERT_DOUBLES_EQUAL (1.5, map.pulse_at_frame (132300), 1e-17); - CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, map.pulse_at_frame (88200), 1e-17); + CPPUNIT_ASSERT_DOUBLES_EQUAL (12.0, map.quarter_note_at_frame (264600), 1e-17); + CPPUNIT_ASSERT_DOUBLES_EQUAL (6.0, map.quarter_note_at_frame (132300), 1e-17); + CPPUNIT_ASSERT_DOUBLES_EQUAL (4.0, map.quarter_note_at_frame (88200), 1e-17); /* pulse - internal minute based interface */ CPPUNIT_ASSERT_DOUBLES_EQUAL (0.1, map.minute_at_pulse_locked (map._metrics, 3.0), 1e-17); |