use note_type explicitly when constructing a Tempo in the hope that others follow.

[ardour.git] / libs / ardour / test / framepos_plus_beats_test.cc

diff --git a/libs/ardour/test/framepos_plus_beats_test.cc b/libs/ardour/test/framepos_plus_beats_test.cc
index cdda6ead1f2cb4877e337c5a6770784dd1f98c64..ab81777840255f9404144a8dcb79fa95c7dfc4c6 100644 (file)
--- a/libs/ardour/test/framepos_plus_beats_test.cc
+++ b/libs/ardour/test/framepos_plus_beats_test.cc
@@ -18,7 +18,7 @@ FrameposPlusBeatsTest::singleTempoTest ()
        double const frames_per_beat = (60 / double (bpm)) * double (sampling_rate);
 
        TempoMap map (sampling_rate);
-       Tempo tempo (bpm);
+       Tempo tempo (bpm, 4.0);
        Meter meter (4, 4);
 
        map.replace_meter (map.first_meter(), meter, BBT_Time (1, 1, 0), AudioTime);
@@ -62,9 +62,9 @@ FrameposPlusBeatsTest::doubleTempoTest ()
 
        */
 
-       Tempo tempoA (120);
+       Tempo tempoA (120, 4.0);
        map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Constant, AudioTime);
-       Tempo tempoB (240);
+       Tempo tempoB (240, 4.0);
        map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, TempoSection::Constant, MusicTime);
 
        /* Now some tests */
@@ -115,9 +115,9 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest ()
 
        */
 
-       Tempo tempoA (120);
+       Tempo tempoA (120, 4.0);
        map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Constant, AudioTime);
-       Tempo tempoB (240);
+       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);
@@ -172,7 +172,7 @@ FrameposPlusBeatsTest::doubleTempoWithComplexMeterTest ()
                                                    4|1|0
        */
 
-       Tempo tempoA (120);
+       Tempo tempoA (120, 4.0);
        map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Constant, AudioTime);
        Tempo tempoB (240, 4.0);
        map.add_tempo (tempoB, 12.0 / 4.0, 0, TempoSection::Constant, MusicTime);