debug instrumentation for locate time

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

diff --git a/libs/ardour/test/framepos_minus_beats_test.cc b/libs/ardour/test/framepos_minus_beats_test.cc
index f80f57d969bbc4a608b2ea290334780adc28419a..fcf20e9238f96a484174b4147528cc87f64b53fe 100644 (file)
--- a/libs/ardour/test/framepos_minus_beats_test.cc
+++ b/libs/ardour/test/framepos_minus_beats_test.cc
@@ -7,6 +7,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION (FrameposMinusBeatsTest);
 using namespace std;
 using namespace ARDOUR;
 using namespace Timecode;
+using namespace Evoral;
 
 /* Basic tests with no tempo / meter changes */
 void
@@ -16,17 +17,21 @@ FrameposMinusBeatsTest::singleTempoTest ()
        int const bpm = 120;
 
        double const frames_per_beat = (60 / double (bpm)) * double (sampling_rate);
-       
+
        TempoMap map (sampling_rate);
        Tempo tempo (bpm);
        Meter meter (4, 4);
 
-       map.add_meter (meter, BBT_Time (1, 1, 0));
-       map.add_tempo (tempo, BBT_Time (1, 1, 0));
+       map.replace_meter (map.first_meter(), meter, BBT_Time (1, 1, 0), (framepos_t) 0, AudioTime);
+       map.replace_tempo (map.first_tempo(), tempo, 0.0, 0, TempoSection::Constant, AudioTime);
 
        /* Subtract 1 beat from beat 3 of the first bar */
-       framepos_t r = map.framepos_minus_beats (frames_per_beat * 2, 1);
+       framepos_t r = map.framepos_minus_qn (frames_per_beat * 2, Beats(1));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (frames_per_beat * 1));
+
+       /* Subtract 4 beats from 3 beats in, to go beyond zero */
+       r = map.framepos_minus_qn (frames_per_beat * 3, Beats(4));
+       CPPUNIT_ASSERT_EQUAL (r, framepos_t (- frames_per_beat));
 }
 
 /* Test adding things that overlap a tempo change */
@@ -37,43 +42,44 @@ FrameposMinusBeatsTest::doubleTempoTest ()
 
        TempoMap map (sampling_rate);
        Meter meter (4, 4);
-       map.add_meter (meter, BBT_Time (1, 1, 0));
+       map.replace_meter (map.first_meter(), meter, BBT_Time (1, 1, 0), (framepos_t) 0, AudioTime);
 
        /*
          120bpm at bar 1, 240bpm at bar 4
-         
+
          120bpm = 24e3 samples per beat
          240bpm = 12e3 samples per beat
        */
-       
+
 
        /*
-         
+
          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 |
 
        */
 
        Tempo tempoA (120);
-       map.add_tempo (tempoA, BBT_Time (1, 1, 0));
+       map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Constant, AudioTime);
        Tempo tempoB (240);
-       map.add_tempo (tempoB, BBT_Time (4, 1, 0));
+       map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, TempoSection::Constant, MusicTime);
 
        /* Now some tests */
 
        /* Subtract 1 beat from 1|2 */
-       framepos_t r = map.framepos_minus_beats (24e3, 1);
+       framepos_t r = map.framepos_minus_qn (24e3, Beats(1));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (0));
 
        /* Subtract 2 beats from 4|2 (over the tempo change) */
-       r = map.framepos_minus_beats (288e3 + 12e3, 2);
+       r = map.framepos_minus_qn (288e3 + 12e3, Beats(2));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (288e3 - 24e3));
 
        /* Subtract 2.5 beats from 4|2 (over the tempo change) */
-       r = map.framepos_minus_beats (288e3 + 12e3, 2.5);
+       r = map.framepos_minus_qn (288e3 + 12e3, Beats(2.5));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (288e3 - 24e3 - 12e3));
 }
 
@@ -81,7 +87,7 @@ FrameposMinusBeatsTest::doubleTempoTest ()
    tempo change (which shouldn't affect anything, since we are just dealing with
    beats)
 */
-   
+
 void
 FrameposMinusBeatsTest::doubleTempoWithMeterTest ()
 {
@@ -89,45 +95,46 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest ()
 
        TempoMap map (sampling_rate);
        Meter meterA (4, 4);
-       map.add_meter (meterA, BBT_Time (1, 1, 0));
+       map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), (framepos_t) 0, AudioTime);
 
        /*
          120bpm at bar 1, 240bpm at bar 4
-         
+
          120bpm = 24e3 samples per beat
          240bpm = 12e3 samples per beat
        */
-       
+
 
        /*
-         
+
          120bpm                                                240bpm
          0 beats                                               12 beats
          0 frames                                              288e3 frames
+         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 |
 
        */
 
        Tempo tempoA (120);
-       map.add_tempo (tempoA, BBT_Time (1, 1, 0));
+       map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Constant, AudioTime);
        Tempo tempoB (240);
-       map.add_tempo (tempoB, BBT_Time (4, 1, 0));
+       map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, TempoSection::Constant, MusicTime);
        Meter meterB (3, 4);
-       map.add_meter (meterB, BBT_Time (4, 1, 0));
+       map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 0, MusicTime);
 
        /* Now some tests */
 
        /* Subtract 1 beat from 1|2 */
-       framepos_t r = map.framepos_minus_beats (24e3, 1);
+       framepos_t r = map.framepos_minus_qn (24e3, Beats(1));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (0));
 
        /* Subtract 2 beats from 4|2 (over the tempo change) */
-       r = map.framepos_minus_beats (288e3 + 12e3, 2);
+       r = map.framepos_minus_qn (288e3 + 12e3, Beats(2));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (288e3 - 24e3));
 
        /* Subtract 2.5 beats from 4|2 (over the tempo change) */
-       r = map.framepos_minus_beats (288e3 + 12e3, 2.5);
+       r = map.framepos_minus_qn (288e3 + 12e3, Beats(2.5));
        CPPUNIT_ASSERT_EQUAL (r, framepos_t (288e3 - 24e3 - 12e3));
 }