diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-12-28 05:33:04 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:09 +1000 |
| commit | 5c6e18e6a087823e4a3719177c92238b206e3aeb (patch) | |
| tree | 25f7faefa65e630e68da70bf4378b825e7c29312 /libs/ardour/test/framepos_minus_beats_test.cc | |
| parent | 41c8b534b70e220b4d4b940aed8a98d9a57003ab (diff) | |
Tempo ramps - remove the concept of bars from tempo sections.
- this helps where tempo and meter have a somewhat circular
dependency.
MetricSection now has a musical position expressed in beats (a double).
MeterSection still has a bbt, but it really isn't needed as we have
enough information to discover the number of bars at a given beat without it.
TempoSection now has a hack to enable loading of legacy sessions, which will
ultimately be a lot cleaner than the current code.
Removing bars from tempo sections also allows us to place them
at arbitrary frames (implemented here).
Diffstat (limited to 'libs/ardour/test/framepos_minus_beats_test.cc')
| -rw-r--r-- | libs/ardour/test/framepos_minus_beats_test.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/ardour/test/framepos_minus_beats_test.cc b/libs/ardour/test/framepos_minus_beats_test.cc index 6f1bba53b2..588a38c097 100644 --- a/libs/ardour/test/framepos_minus_beats_test.cc +++ b/libs/ardour/test/framepos_minus_beats_test.cc @@ -22,8 +22,8 @@ FrameposMinusBeatsTest::singleTempoTest () Tempo tempo (bpm); Meter meter (4, 4); - map.add_meter (meter, BBT_Time (1, 1, 0)); - map.add_tempo (tempo, BBT_Time (1, 1, 0), TempoSection::Type::Constant); + map.add_meter (meter, 0.0, BBT_Time (1, 1, 0)); + map.add_tempo (tempo, 0.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)); @@ -42,7 +42,7 @@ FrameposMinusBeatsTest::doubleTempoTest () TempoMap map (sampling_rate); Meter meter (4, 4); - map.add_meter (meter, BBT_Time (1, 1, 0)); + map.add_meter (meter, 0.0, BBT_Time (1, 1, 0)); /* 120bpm at bar 1, 240bpm at bar 4 @@ -63,9 +63,9 @@ FrameposMinusBeatsTest::doubleTempoTest () */ Tempo tempoA (120); - map.add_tempo (tempoA, BBT_Time (1, 1, 0), TempoSection::Type::Constant); + map.add_tempo (tempoA, 0.0, TempoSection::Type::Constant); Tempo tempoB (240); - map.add_tempo (tempoB, BBT_Time (4, 1, 0), TempoSection::Type::Constant); + map.add_tempo (tempoB, 12.0, TempoSection::Type::Constant); /* Now some tests */ @@ -94,7 +94,7 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest () TempoMap map (sampling_rate); Meter meterA (4, 4); - map.add_meter (meterA, BBT_Time (1, 1, 0)); + map.add_meter (meterA, 0.0, BBT_Time (1, 1, 0)); /* 120bpm at bar 1, 240bpm at bar 4 @@ -115,11 +115,11 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest () */ Tempo tempoA (120); - map.add_tempo (tempoA, BBT_Time (1, 1, 0), TempoSection::Type::Constant); + map.add_tempo (tempoA, 0.0, TempoSection::Type::Constant); Tempo tempoB (240); - map.add_tempo (tempoB, BBT_Time (4, 1, 0), TempoSection::Type::Constant); + map.add_tempo (tempoB, 12.0, TempoSection::Type::Constant); Meter meterB (3, 4); - map.add_meter (meterB, BBT_Time (4, 1, 0)); + map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0)); /* Now some tests */ |