From 074db3b861926012e9434fe15135ac401da6cb5c Mon Sep 17 00:00:00 2001 From: nick_m Date: Sat, 21 May 2016 01:45:37 +1000 Subject: Tempo ramps - more code consolidation wrt add meter/tempo. --- libs/ardour/test/tempo_test.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libs/ardour/test/tempo_test.cc') diff --git a/libs/ardour/test/tempo_test.cc b/libs/ardour/test/tempo_test.cc index 621a72dd96..6caa48648f 100644 --- a/libs/ardour/test/tempo_test.cc +++ b/libs/ardour/test/tempo_test.cc @@ -14,7 +14,7 @@ TempoTest::recomputeMapTest () 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 @@ -36,11 +36,11 @@ TempoTest::recomputeMapTest () */ 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, 4.0, TempoSection::Constant); + map.add_tempo (tempoB, 4.0, 0, TempoSection::Constant, MusicTime); Meter meterB (3, 4); - map.add_meter_beat (meterB, 12.0, BBT_Time (4, 1, 0)); + map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 0, MusicTime); list::iterator i = map._metrics.begin(); CPPUNIT_ASSERT_EQUAL (framepos_t (0), (*i)->frame ()); @@ -59,9 +59,9 @@ TempoTest::rampTest () Meter meterA (4, 4); Tempo tempoA (77.0, 4.0); Tempo tempoB (217.0, 4.0); - map.add_tempo_frame (tempoA, (framepos_t) 0, TempoSection::Ramp); - map.add_tempo_frame (tempoB, (framepos_t) 60 * sampling_rate, TempoSection::Ramp); - map.add_meter_beat (meterA, 0.0, BBT_Time (1, 1, 0)); + map.add_tempo (tempoA, 0.0, 0, TempoSection::Ramp, AudioTime); + map.add_tempo (tempoB, 0.0, (framepos_t) 60 * sampling_rate, TempoSection::Ramp, AudioTime); + map.add_meter (meterA, 0.0, BBT_Time (1, 1, 0), 0, AudioTime); /* -- cgit v1.2.3