diff options
Diffstat (limited to 'libs/ardour/test/framewalk_to_beats_test.cc')
| -rw-r--r-- | libs/ardour/test/framewalk_to_beats_test.cc | 52 |
1 files changed, 42 insertions, 10 deletions
diff --git a/libs/ardour/test/framewalk_to_beats_test.cc b/libs/ardour/test/framewalk_to_beats_test.cc index 75a1e576b5..91bf7f09b0 100644 --- a/libs/ardour/test/framewalk_to_beats_test.cc +++ b/libs/ardour/test/framewalk_to_beats_test.cc @@ -24,19 +24,19 @@ FramewalkToBeatsTest::singleTempoTest () map.replace_tempo (map.tempo_section_at_frame (0), tempo, 0.0, 0, TempoSection::Constant, AudioTime); /* Walk 1 beats-worth of frames from beat 3 */ - double r = map.framewalk_to_beats (frames_per_beat * 2, frames_per_beat * 1).to_double(); + double r = map.framewalk_to_qn (frames_per_beat * 2, frames_per_beat * 1).to_double(); CPPUNIT_ASSERT_EQUAL (1.0, r); /* Walk 6 beats-worth of frames from beat 4 */ - r = map.framewalk_to_beats (frames_per_beat * 3, frames_per_beat * 6).to_double(); + r = map.framewalk_to_qn (frames_per_beat * 3, frames_per_beat * 6).to_double(); CPPUNIT_ASSERT_EQUAL (6.0, r); /* Walk 1.5 beats-worth of frames from beat 3 */ - r = map.framewalk_to_beats (frames_per_beat * 2, frames_per_beat * 1.5).to_double(); + r = map.framewalk_to_qn (frames_per_beat * 2, frames_per_beat * 1.5).to_double(); CPPUNIT_ASSERT_EQUAL (1.5, r); /* Walk 1.5 beats-worth of frames from beat 2.5 */ - r = map.framewalk_to_beats (frames_per_beat * 2.5, frames_per_beat * 1.5).to_double(); + r = map.framewalk_to_qn (frames_per_beat * 2.5, frames_per_beat * 1.5).to_double(); CPPUNIT_ASSERT_EQUAL (1.5, r); } @@ -78,22 +78,22 @@ FramewalkToBeatsTest::doubleTempoTest () /* Now some tests */ /* Walk 1 beat from 1|2 */ - double r = map.framewalk_to_beats (24e3, 24e3).to_double(); + double r = map.framewalk_to_qn (24e3, 24e3).to_double(); CPPUNIT_ASSERT_EQUAL (1.0, r); /* Walk 2 beats from 3|3 to 4|1 (over the tempo change) */ - r = map.framewalk_to_beats (240e3, (24e3 + 24e3)).to_double(); + r = map.framewalk_to_qn (240e3, (24e3 + 24e3)).to_double(); CPPUNIT_ASSERT_EQUAL (2.0, r); /* Walk 2.5 beats from 3|3.5 to 4.2 (over the tempo change) */ - r = map.framewalk_to_beats (264e3 - 12e3, (24e3 + 12e3 + 12e3)).to_double(); + r = map.framewalk_to_qn (264e3 - 12e3, (24e3 + 12e3 + 12e3)).to_double(); CPPUNIT_ASSERT_EQUAL (2.5, r); /* Walk 3 beats from 3|4.5 to 4|3.5 (over the tempo change) */ - r = map.framewalk_to_beats (264e3 - 12e3, (24e3 + 12e3 + 12e3 + 6e3)).to_double(); + r = map.framewalk_to_qn (264e3 - 12e3, (24e3 + 12e3 + 12e3 + 6e3)).to_double(); CPPUNIT_ASSERT_EQUAL (3.0, r); /* Walk 3.5 beats from 3|4.5 to 4.4 (over the tempo change) */ - r = map.framewalk_to_beats (264e3 - 12e3, (24e3 + 12e3 + 12e3 + 12e3)).to_double(); + r = map.framewalk_to_qn (264e3 - 12e3, (24e3 + 12e3 + 12e3 + 12e3)).to_double(); CPPUNIT_ASSERT_EQUAL (3.5, r); } @@ -134,6 +134,38 @@ FramewalkToBeatsTest::tripleTempoTest () map.add_tempo (tempoC, 8.0 / tempoB.note_type(), 0, TempoSection::Constant, MusicTime); /* Walk from 1|3 to 4|1 */ - double r = map.framewalk_to_beats (2 * 24e3, (2 * 24e3) + (4 * 12e3) + (4 * 18e3)).to_double(); + double r = map.framewalk_to_qn (2 * 24e3, (2 * 24e3) + (4 * 12e3) + (4 * 18e3)).to_double(); CPPUNIT_ASSERT_EQUAL (10.0, r); } + +void +FramewalkToBeatsTest::singleTempoMeterTest () +{ + int const sampling_rate = 48000; + int const bpm = 120; + + double const frames_per_beat = (60 / double (bpm)) * double (sampling_rate); + + TempoMap map (sampling_rate); + Tempo tempo (bpm); + Meter meter (7, 8); + + map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), (framepos_t) 0, AudioTime); + map.replace_tempo (map.tempo_section_at_frame (0), tempo, 0.0, 0, TempoSection::Constant, AudioTime); + + /* Walk 1 qn beats-worth of frames from beat 3 */ + double r = map.framewalk_to_qn (frames_per_beat * 2, frames_per_beat * 1).to_double(); + CPPUNIT_ASSERT_EQUAL (1.0, r); + + /* Walk 6 qn beats-worth of frames from beat 4 */ + r = map.framewalk_to_qn (frames_per_beat * 3, frames_per_beat * 6).to_double(); + CPPUNIT_ASSERT_EQUAL (6.0, r); + + /* Walk 1.5 qn beats-worth of frames from beat 3 */ + r = map.framewalk_to_qn (frames_per_beat * 2, frames_per_beat * 1.5).to_double(); + CPPUNIT_ASSERT_EQUAL (1.5, r); + + /* Walk 1.5 qn beats-worth of frames from beat 2.5 */ + r = map.framewalk_to_qn (frames_per_beat * 2.5, frames_per_beat * 1.5).to_double(); + CPPUNIT_ASSERT_EQUAL (1.5, r); +} |