diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-08-10 01:46:05 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-08-10 01:46:05 +1000 |
| commit | 9acfdb31a29e218efcb9126e03b97c1c5edf8af4 (patch) | |
| tree | c632e3f66eb73a7a8360ab50096f49cd16bc5ff7 /libs/ardour/test/tempo_test.cc | |
| parent | 4ddb6b74f5c0fe445b49e9abb5527afecc60dd8b (diff) | |
Make tempo tests use the api more correctly.
- TempoMap initially contains a tempo and meter.
using add_tempo/meter() using the position of an
existing section does the right thing, but prints a warning.
Use replace_tempo/meter().
Diffstat (limited to 'libs/ardour/test/tempo_test.cc')
| -rw-r--r-- | libs/ardour/test/tempo_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/test/tempo_test.cc b/libs/ardour/test/tempo_test.cc index d7c5724d30..04bf071cac 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 (meterA, 0.0, BBT_Time (1, 1, 0), 0, AudioTime); + map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), (framepos_t) 0, AudioTime); /* 120bpm at bar 1, 240bpm at bar 4 @@ -36,7 +36,7 @@ TempoTest::recomputeMapTest () */ Tempo tempoA (120); - map.add_tempo (tempoA, 0.0, 0, TempoSection::Constant, AudioTime); + map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Constant, AudioTime); Tempo tempoB (240); map.add_tempo (tempoB, 3.0, 0, TempoSection::Constant, MusicTime); Meter meterB (3, 4); @@ -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 (tempoA, 0.0, 0, TempoSection::Ramp, AudioTime); + map.replace_tempo (map.first_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); + map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), (framepos_t) 0, AudioTime); /* |