diff options
author | nick_m <mainsbridge@gmail.com> | 2017-02-26 02:22:19 +1100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-02-27 20:16:10 +0100 |
commit | 97c4c2a28c19b7979ecbfd2eff28a351dfae1e6a (patch) | |
tree | 01a697ce2c07e532170288d33fae384d07b4f8ce /libs/ardour/test/framepos_plus_beats_test.cc | |
parent | ac19a51d38906f347baeb767d9b011955030921c (diff) |
complete changes to tempo type.
- this implements in the intention behind the previous commit.
a tempo mark is constant until its end has been changed by a
shift-drag on the next marker.
Diffstat (limited to 'libs/ardour/test/framepos_plus_beats_test.cc')
-rw-r--r-- | libs/ardour/test/framepos_plus_beats_test.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/test/framepos_plus_beats_test.cc b/libs/ardour/test/framepos_plus_beats_test.cc index c59578772c..cb5211b007 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.replace_meter (map.first_meter(), meter, BBT_Time (1, 1, 0), 0, AudioTime); - map.replace_tempo (map.first_tempo(), tempo, 0.0, 0, TempoSection::Constant, AudioTime); + map.replace_tempo (map.first_tempo(), tempo, 0.0, 0, AudioTime); /* Add 1 beat to beat 3 of the first bar */ framepos_t r = map.framepos_plus_qn (frames_per_beat * 2, Evoral::Beats(1)); @@ -63,9 +63,9 @@ FrameposPlusBeatsTest::doubleTempoTest () */ Tempo tempoA (120, 4.0); - map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Constant, AudioTime); + map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, AudioTime); Tempo tempoB (240, 4.0); - map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, TempoSection::Constant, MusicTime); + map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, MusicTime); /* Now some tests */ @@ -116,9 +116,9 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest () */ Tempo tempoA (120, 4.0); - map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Constant, AudioTime); + map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, AudioTime); Tempo tempoB (240, 4.0); - map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, TempoSection::Constant, MusicTime); + map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, MusicTime); Meter meterB (3, 8); map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 0, MusicTime); @@ -173,9 +173,9 @@ FrameposPlusBeatsTest::doubleTempoWithComplexMeterTest () */ Tempo tempoA (120, 4.0); - map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Constant, AudioTime); + map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, AudioTime); Tempo tempoB (240, 4.0); - map.add_tempo (tempoB, 12.0 / 4.0, 0, TempoSection::Constant, MusicTime); + map.add_tempo (tempoB, 12.0 / 4.0, 0, MusicTime); Meter meterB (5, 8); map.add_meter (meterB, 9.0, BBT_Time (4, 1, 0), 0, MusicTime); /* Now some tests */ |