diff options
Diffstat (limited to 'libs/ardour/test/framepos_plus_beats_test.cc')
-rw-r--r-- | libs/ardour/test/framepos_plus_beats_test.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/ardour/test/framepos_plus_beats_test.cc b/libs/ardour/test/framepos_plus_beats_test.cc index faf304ca82..a82415ac23 100644 --- a/libs/ardour/test/framepos_plus_beats_test.cc +++ b/libs/ardour/test/framepos_plus_beats_test.cc @@ -21,8 +21,8 @@ FrameposPlusBeatsTest::singleTempoTest () Tempo tempo (bpm); Meter meter (4, 4); - map.add_meter_beat (meter, 0.0, BBT_Time (1, 1, 0)); - map.add_tempo_pulse (tempo, 0.0, TempoSection::Constant); + map.add_meter (meter, 0.0, BBT_Time (1, 1, 0), 0, AudioTime); + map.add_tempo (tempo, 0.0, 0, TempoSection::Constant, AudioTime); /* Add 1 beat to beat 3 of the first bar */ framepos_t r = map.framepos_plus_beats (frames_per_beat * 2, Evoral::Beats(1)); @@ -41,7 +41,7 @@ FrameposPlusBeatsTest::doubleTempoTest () TempoMap map (sampling_rate); Meter meter (4, 4); - map.add_meter_beat (meter, 0.0, BBT_Time (1, 1, 0)); + map.add_meter (meter, 0.0, BBT_Time (1, 1, 0), 0, AudioTime); /* 120bpm at bar 1, 240bpm at bar 4 @@ -63,9 +63,9 @@ FrameposPlusBeatsTest::doubleTempoTest () */ Tempo tempoA (120); - map.add_tempo_pulse (tempoA, 0.0, TempoSection::Constant); + map.add_tempo (tempoA, 0.0, 0, TempoSection::Constant, AudioTime); Tempo tempoB (240); - map.add_tempo_pulse (tempoB, 12.0 / tempoA.note_type(), TempoSection::Constant); + map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, TempoSection::Constant, MusicTime); /* Now some tests */ @@ -94,7 +94,7 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest () TempoMap map (sampling_rate); Meter meterA (4, 4); - map.add_meter_beat (meterA, 0.0, BBT_Time (1, 1, 0)); + map.add_meter (meterA, 0.0, BBT_Time (1, 1, 0), 0, AudioTime); /* 120bpm at bar 1, 240bpm at bar 4 @@ -116,11 +116,11 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest () */ Tempo tempoA (120); - map.add_tempo_pulse (tempoA, 0.0, TempoSection::Constant); + map.add_tempo (tempoA, 0.0, 0, TempoSection::Constant, AudioTime); Tempo tempoB (240); - map.add_tempo_pulse (tempoB, 12.0 / tempoA.note_type(), TempoSection::Constant); + map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, TempoSection::Constant, MusicTime); Meter meterB (3, 4); - map.add_meter_beat (meterB, 12.0 / tempoA.note_type(), BBT_Time (4, 1, 0)); + map.add_meter (meterB, 12.0 / tempoA.note_type(), BBT_Time (4, 1, 0), 0, MusicTime); /* Now some tests */ |