diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-06-25 01:37:48 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-06-25 01:37:48 +1000 |
| commit | cde951f30f7b80a255b598a523c456e243b66bcb (patch) | |
| tree | c6a9d87f4571a9871c0c3b17fb0bf629b16d42af /libs/ardour/test | |
| parent | a8fa5e9158f78e8d10aacdb1988b8409b1a831d7 (diff) | |
Fix counting thinko in tests.
- note that the negative framepos in
FrameposPlusBeatsTest::singleTempoTest() will
not pass. needs some thougt as to whether it is testing
the correct thing.
Diffstat (limited to 'libs/ardour/test')
| -rw-r--r-- | libs/ardour/test/framepos_minus_beats_test.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/test/framepos_plus_beats_test.cc | 6 | ||||
| -rw-r--r-- | libs/ardour/test/tempo_test.cc | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/test/framepos_minus_beats_test.cc b/libs/ardour/test/framepos_minus_beats_test.cc index e9a1403cc0..09c91756b6 100644 --- a/libs/ardour/test/framepos_minus_beats_test.cc +++ b/libs/ardour/test/framepos_minus_beats_test.cc @@ -110,7 +110,7 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest () 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames - 0 pulses 4 pulses + 0 pulses 3 pulses | | | | | | 1.1 1.2 1.3 1.4 | 2.1 2.2 2.3.2.4 | 3.1 3.2 3.3 3.4 | 4.1 4.2 4.3 | @@ -121,7 +121,7 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest () Tempo tempoB (240); map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, TempoSection::Constant, MusicTime); Meter meterB (3, 4); - map.add_meter (meterB, 12.0 / tempoA.note_type(), BBT_Time (4, 1, 0), 0, MusicTime); + map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 0, MusicTime); /* Now some tests */ diff --git a/libs/ardour/test/framepos_plus_beats_test.cc b/libs/ardour/test/framepos_plus_beats_test.cc index a82415ac23..a1a72d5dcb 100644 --- a/libs/ardour/test/framepos_plus_beats_test.cc +++ b/libs/ardour/test/framepos_plus_beats_test.cc @@ -56,7 +56,7 @@ FrameposPlusBeatsTest::doubleTempoTest () 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames - 0 pulses 4 pulses + 0 pulses 3 pulses | | | | | | 1.1 1.2 1.3 1.4 | 2.1 2.2 2.3.2.4 | 3.1 3.2 3.3 3.4 | 4.1 4.2 4.3 4.4 | @@ -109,7 +109,7 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest () 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames - 0 pulses 4 pulses + 0 pulses 3 pulses | | | | | | 1.1 1.2 1.3 1.4 | 2.1 2.2 2.3.2.4 | 3.1 3.2 3.3 3.4 | 4.1 4.2 4.3 | @@ -120,7 +120,7 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest () Tempo tempoB (240); map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, TempoSection::Constant, MusicTime); Meter meterB (3, 4); - map.add_meter (meterB, 12.0 / tempoA.note_type(), BBT_Time (4, 1, 0), 0, MusicTime); + map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 0, MusicTime); /* Now some tests */ diff --git a/libs/ardour/test/tempo_test.cc b/libs/ardour/test/tempo_test.cc index 6caa48648f..d7c5724d30 100644 --- a/libs/ardour/test/tempo_test.cc +++ b/libs/ardour/test/tempo_test.cc @@ -29,7 +29,7 @@ TempoTest::recomputeMapTest () 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames - 0 pulses 4 pulses + 0 pulses 3 pulses | | | | | | 1.1 1.2 1.3 1.4 | 2.1 2.2 2.3.2.4 | 3.1 3.2 3.3 3.4 | 4.1 4.2 4.3 | @@ -38,7 +38,7 @@ TempoTest::recomputeMapTest () Tempo tempoA (120); map.add_tempo (tempoA, 0.0, 0, TempoSection::Constant, AudioTime); Tempo tempoB (240); - map.add_tempo (tempoB, 4.0, 0, TempoSection::Constant, MusicTime); + map.add_tempo (tempoB, 3.0, 0, TempoSection::Constant, MusicTime); Meter meterB (3, 4); map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 0, MusicTime); |