diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-12-22 01:21:54 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:09 +1000 |
| commit | 7898435d3f94355fa0996dc9f85b3bc1ef173585 (patch) | |
| tree | 77dd39b6122330328b15046a8ae45e4fdaeda483 /libs/ardour/test/framewalk_to_beats_test.cc | |
| parent | 9eeccf0c17094708996c3c491f265877b04199fe (diff) | |
Tempo ramps - define_one_bar() delivers constant tempo.
- also some renaming and code review
Diffstat (limited to 'libs/ardour/test/framewalk_to_beats_test.cc')
| -rw-r--r-- | libs/ardour/test/framewalk_to_beats_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/test/framewalk_to_beats_test.cc b/libs/ardour/test/framewalk_to_beats_test.cc index 67a9be72c4..84ddf6fc30 100644 --- a/libs/ardour/test/framewalk_to_beats_test.cc +++ b/libs/ardour/test/framewalk_to_beats_test.cc @@ -21,7 +21,7 @@ FramewalkToBeatsTest::singleTempoTest () Meter meter (4, 4); map.add_meter (meter, BBT_Time (1, 1, 0)); - map.add_tempo (tempo, BBT_Time (1, 1, 0), TempoSection::TempoSectionType::Constant); + map.add_tempo (tempo, BBT_Time (1, 1, 0), TempoSection::Type::Constant); /* 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(); @@ -70,9 +70,9 @@ FramewalkToBeatsTest::doubleTempoTest () */ Tempo tempoA (120); - map.add_tempo (tempoA, BBT_Time (1, 1, 0), TempoSection::TempoSectionType::Constant); + map.add_tempo (tempoA, BBT_Time (1, 1, 0), TempoSection::Type::Constant); Tempo tempoB (240); - map.add_tempo (tempoB, BBT_Time (4, 1, 0), TempoSection::TempoSectionType::Constant); + map.add_tempo (tempoB, BBT_Time (4, 1, 0), TempoSection::Type::Constant); /* Now some tests */ @@ -125,11 +125,11 @@ FramewalkToBeatsTest::tripleTempoTest () */ Tempo tempoA (120); - map.add_tempo (tempoA, BBT_Time (1, 1, 0), TempoSection::TempoSectionType::Constant); + map.add_tempo (tempoA, BBT_Time (1, 1, 0), TempoSection::Type::Constant); Tempo tempoB (240); - map.add_tempo (tempoB, BBT_Time (2, 1, 0), TempoSection::TempoSectionType::Constant); + map.add_tempo (tempoB, BBT_Time (2, 1, 0), TempoSection::Type::Constant); Tempo tempoC (160); - map.add_tempo (tempoC, BBT_Time (3, 1, 0), TempoSection::TempoSectionType::Constant); + map.add_tempo (tempoC, BBT_Time (3, 1, 0), TempoSection::Type::Constant); /* Walk from 1|3 to 4|1 */ double r = map.framewalk_to_beats (2 * 24e3, (2 * 24e3) + (4 * 12e3) + (4 * 18e3)).to_double(); |