From 7898435d3f94355fa0996dc9f85b3bc1ef173585 Mon Sep 17 00:00:00 2001 From: nick_m Date: Tue, 22 Dec 2015 01:21:54 +1100 Subject: Tempo ramps - define_one_bar() delivers constant tempo. - also some renaming and code review --- libs/ardour/test/framepos_minus_beats_test.cc | 10 +++++----- libs/ardour/test/framepos_plus_beats_test.cc | 10 +++++----- libs/ardour/test/framewalk_to_beats_test.cc | 12 ++++++------ libs/ardour/test/midi_clock_slave_test.h | 2 +- libs/ardour/test/tempo_test.cc | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) (limited to 'libs/ardour/test') diff --git a/libs/ardour/test/framepos_minus_beats_test.cc b/libs/ardour/test/framepos_minus_beats_test.cc index 7b6941e507..6f1bba53b2 100644 --- a/libs/ardour/test/framepos_minus_beats_test.cc +++ b/libs/ardour/test/framepos_minus_beats_test.cc @@ -23,7 +23,7 @@ FrameposMinusBeatsTest::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); /* Subtract 1 beat from beat 3 of the first bar */ framepos_t r = map.framepos_minus_beats (frames_per_beat * 2, Beats(1)); @@ -63,9 +63,9 @@ FrameposMinusBeatsTest::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 */ @@ -115,9 +115,9 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest () */ 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); Meter meterB (3, 4); map.add_meter (meterB, BBT_Time (4, 1, 0)); diff --git a/libs/ardour/test/framepos_plus_beats_test.cc b/libs/ardour/test/framepos_plus_beats_test.cc index 442c9b3d56..425ae84343 100644 --- a/libs/ardour/test/framepos_plus_beats_test.cc +++ b/libs/ardour/test/framepos_plus_beats_test.cc @@ -22,7 +22,7 @@ FrameposPlusBeatsTest::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); /* Add 1 beat to beat 3 of the first bar */ framepos_t r = map.framepos_plus_beats (frames_per_beat * 2, Evoral::Beats(1)); @@ -62,9 +62,9 @@ FrameposPlusBeatsTest::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 */ @@ -114,9 +114,9 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest () */ 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); Meter meterB (3, 4); map.add_meter (meterB, BBT_Time (4, 1, 0)); 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(); diff --git a/libs/ardour/test/midi_clock_slave_test.h b/libs/ardour/test/midi_clock_slave_test.h index d5d7a86153..392e2876e9 100644 --- a/libs/ardour/test/midi_clock_slave_test.h +++ b/libs/ardour/test/midi_clock_slave_test.h @@ -48,7 +48,7 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy { meter (4.0, 4.0) { _tempo_map = new TempoMap (FRAME_RATE); - _tempo_map->add_tempo (tempo, Timecode::BBT_Time(1, 1, 0), TempoSection::TempoSectionType::Constant); + _tempo_map->add_tempo (tempo, Timecode::BBT_Time(1, 1, 0), TempoSection::Type::Constant); _tempo_map->add_meter (meter, Timecode::BBT_Time(1, 1, 0)); } diff --git a/libs/ardour/test/tempo_test.cc b/libs/ardour/test/tempo_test.cc index 21bd8eb627..04b24f6d73 100644 --- a/libs/ardour/test/tempo_test.cc +++ b/libs/ardour/test/tempo_test.cc @@ -35,9 +35,9 @@ TempoTest::recomputeMapTest () */ 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); Meter meterB (3, 4); map.add_meter (meterB, BBT_Time (4, 1, 0)); -- cgit v1.2.3