summaryrefslogtreecommitdiff
path: root/libs/ardour/test/framepos_minus_beats_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/test/framepos_minus_beats_test.cc')
-rw-r--r--libs/ardour/test/framepos_minus_beats_test.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/ardour/test/framepos_minus_beats_test.cc b/libs/ardour/test/framepos_minus_beats_test.cc
index fd06f7de84..6982529bf6 100644
--- a/libs/ardour/test/framepos_minus_beats_test.cc
+++ b/libs/ardour/test/framepos_minus_beats_test.cc
@@ -57,6 +57,7 @@ FrameposMinusBeatsTest::doubleTempoTest ()
120bpm 240bpm
0 beats 12 beats
0 frames 288e3 frames
+ 0 pulses 4 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 |
@@ -65,7 +66,7 @@ FrameposMinusBeatsTest::doubleTempoTest ()
Tempo tempoA (120);
map.add_tempo (tempoA, 0.0, TempoSection::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, 12.0, TempoSection::Constant);
+ map.add_tempo (tempoB, 12.0 / tempoA.note_type(), TempoSection::Constant);
/* Now some tests */
@@ -109,6 +110,7 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest ()
120bpm 240bpm
0 beats 12 beats
0 frames 288e3 frames
+ 0 pulses 4 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 |
@@ -117,9 +119,9 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest ()
Tempo tempoA (120);
map.add_tempo (tempoA, 0.0, TempoSection::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, 12.0, TempoSection::Constant);
+ map.add_tempo (tempoB, 12.0 / tempoA.note_type(), TempoSection::Constant);
Meter meterB (3, 4);
- map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0));
+ map.add_meter (meterB, 12.0 / tempoA.note_type(), BBT_Time (4, 1, 0));
/* Now some tests */