diff options
author | nick_m <mainsbridge@gmail.com> | 2016-12-19 04:02:01 +1100 |
---|---|---|
committer | nick_m <mainsbridge@gmail.com> | 2016-12-19 04:02:01 +1100 |
commit | 27b95300e2762566e766e0627e92ceb3b20f2efa (patch) | |
tree | 8fa07d2a95ff04ee11a795bcdc5c4826569cb8a6 /libs/ardour/test/framepos_plus_beats_test.cc | |
parent | f9743a1eb120770aadbd1981d053f6455895004f (diff) |
add frame parameter for Meter ctor and TempoMap::replace_meter(). allow for various failures.
Diffstat (limited to 'libs/ardour/test/framepos_plus_beats_test.cc')
-rw-r--r-- | libs/ardour/test/framepos_plus_beats_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/test/framepos_plus_beats_test.cc b/libs/ardour/test/framepos_plus_beats_test.cc index ab81777840..c59578772c 100644 --- a/libs/ardour/test/framepos_plus_beats_test.cc +++ b/libs/ardour/test/framepos_plus_beats_test.cc @@ -21,7 +21,7 @@ FrameposPlusBeatsTest::singleTempoTest () Tempo tempo (bpm, 4.0); Meter meter (4, 4); - map.replace_meter (map.first_meter(), meter, BBT_Time (1, 1, 0), AudioTime); + 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); /* Add 1 beat to beat 3 of the first bar */ @@ -41,7 +41,7 @@ FrameposPlusBeatsTest::doubleTempoTest () TempoMap map (sampling_rate); Meter meter (4, 4); - map.replace_meter (map.first_meter(), meter, BBT_Time (1, 1, 0), AudioTime); + map.replace_meter (map.first_meter(), meter, BBT_Time (1, 1, 0), 0, AudioTime); /* 120bpm at bar 1, 240bpm at bar 4 @@ -94,7 +94,7 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest () TempoMap map (sampling_rate); Meter meterA (4, 4); - map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), AudioTime); + map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), 0, AudioTime); /* 120bpm at bar 1, 240bpm at bar 4 @@ -120,7 +120,7 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest () Tempo tempoB (240, 4.0); map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, TempoSection::Constant, MusicTime); Meter meterB (3, 8); - map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), MusicTime); + map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 0, MusicTime); /* Now some tests */ @@ -149,7 +149,7 @@ FrameposPlusBeatsTest::doubleTempoWithComplexMeterTest () TempoMap map (sampling_rate); Meter meterA (3, 4); - map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), AudioTime); + map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), 0, AudioTime); /* 120bpm at bar 1, 240bpm at bar 4 @@ -177,7 +177,7 @@ FrameposPlusBeatsTest::doubleTempoWithComplexMeterTest () Tempo tempoB (240, 4.0); map.add_tempo (tempoB, 12.0 / 4.0, 0, TempoSection::Constant, MusicTime); Meter meterB (5, 8); - map.add_meter (meterB, 9.0, BBT_Time (4, 1, 0), MusicTime); + map.add_meter (meterB, 9.0, BBT_Time (4, 1, 0), 0, MusicTime); /* Now some tests */ /* Add 1 beat to 1|2 */ |