add frame parameter for Meter ctor and TempoMap::replace_meter(). allow for various...

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 8e2e476d15727095e70947d474640b78b26fa3c7..899f36ee515ff767e1afb7ef7d710055c10e8831 100644 (file)
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -291,7 +291,7 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf)
                if (have_meter) {
                        bbt  = new_map.bbt_at_beat ((t->time_pulses/smf.ppqn()));
                }
-               new_map.add_meter (meter, t->time_pulses, bbt, MusicTime);
+               new_map.add_meter (meter, t->time_pulses, bbt, 0, MusicTime);
 
                cerr << "@ " << t->time_pulses/smf.ppqn() << " ("
                     << t->time_seconds << ") Add T " << tempo << " M " << meter << endl;

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 6555ec9c52be0460260456d6ebd984598cea223b..e4c86f97b1cc35e3926b94f7e90ab086fcf9791c 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -3287,8 +3287,9 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
                                --bbt.bars;
                        }
                        const double beat = map.beat_at_bbt (bbt);
+                       const framepos_t frame = map.frame_at_beat (beat);
                        _real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor())
-                                                      , beat, bbt, _real_section->position_lock_style());
+                                                      , beat, bbt, frame, _real_section->position_lock_style());
                        if (!_real_section) {
                                aborted (true);
                                return;

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 1c339d9dd361bfa37bdf44daa574f2114516f8fc..a4d990b1e3fa8ede3678929a137588ae7ec6d7b3 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -1396,7 +1396,7 @@ Editor::toggle_marker_lock_style ()
                const Timecode::BBT_Time bbt (msp->bbt());
                const PositionLockStyle pls = (msp->position_lock_style() == AudioTime) ? MusicTime : AudioTime;
 
-               _session->tempo_map().replace_meter (*msp, meter, bbt, pls);
+               _session->tempo_map().replace_meter (*msp, meter, bbt, msp->frame(), pls);
 
                XMLNode &after = _session->tempo_map().get_state();
                _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 4463ec825b6cf200b45016b91a8267fe9c049de7..e98959ba9d6d3114660b2b499cd26074c505a287 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -409,14 +409,14 @@ Editor::mouse_add_new_meter_event (framepos_t frame)
        meter_dialog.get_bbt_time (requested);
 
        const double beat = map.beat_at_bbt (requested);
-
+       const double al_frame = map.frame_at_beat (beat);
        begin_reversible_command (_("add meter mark"));
         XMLNode &before = map.get_state();
 
        if (meter_dialog.get_lock_style() == MusicTime) {
-               map.add_meter (Meter (bpb, note_type), beat, requested, MusicTime);
+               map.add_meter (Meter (bpb, note_type), beat, requested, 0, MusicTime);
        } else {
-               map.add_meter (Meter (bpb, note_type), beat, requested, AudioTime);
+               map.add_meter (Meter (bpb, note_type), beat, requested, al_frame, AudioTime);
        }
 
        _session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state()));
@@ -466,13 +466,13 @@ Editor::edit_meter_section (MeterSection* section)
 
        Timecode::BBT_Time when;
        meter_dialog.get_bbt_time (when);
-
+       const framepos_t frame = _session->tempo_map().frame_at_bbt (when);
        const PositionLockStyle pls = (meter_dialog.get_lock_style() == AudioTime) ? AudioTime : MusicTime;
 
        begin_reversible_command (_("replace meter mark"));
         XMLNode &before = _session->tempo_map().get_state();
 
-       _session->tempo_map().replace_meter (*section, meter, when, pls);
+       _session->tempo_map().replace_meter (*section, meter, when, frame, pls);
 
        XMLNode &after = _session->tempo_map().get_state();
        _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));

diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index 026f5176f52f4e3d92667b85d6141a201521b79f..5e5c8ad20faff005829973372fe322768b7cb24e 100644 (file)
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -359,12 +359,20 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
         */
        TempoSection* add_tempo (const Tempo&, const double& pulse, const framepos_t& frame, TempoSection::Type type, PositionLockStyle pls);
 
-       /** add an meter section locked to pls.. ignored values will be set in recompute_meters()
+       /** add a meter section locked to pls.. ignored values will be set in recompute_meters()
+        * @param meter the Meter to be added
         * @param beat beat position of new section
         * @param where bbt position of new section
         * @param frame frame position of new section. ignored if pls == MusicTime
+        * note that @frame may also be ignored if it would create an un-solvable map
+        * (previous audio-locked tempi may place the requested beat at an earlier time than frame)
+        * in which case the new meter will be placed at the specified BBT.
+        * @param  pls the position lock style
+        *
+        * adding an audio-locked meter will add a meter-locked tempo section at the meter position.
+        * the meter-locked tempo tempo will be the Tempo at @beat
         */
-       MeterSection* add_meter (const Meter&, const double& beat, const Timecode::BBT_Time& where, PositionLockStyle pls);
+       MeterSection* add_meter (const Meter& meter, const double& beat, const Timecode::BBT_Time& where, framepos_t frame, PositionLockStyle pls);
 
        void remove_tempo (const TempoSection&, bool send_signal);
        void remove_meter (const MeterSection&, bool send_signal);
@@ -372,7 +380,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
        void replace_tempo (const TempoSection&, const Tempo&, const double& pulse, const framepos_t& frame
                            , TempoSection::Type type, PositionLockStyle pls);
 
-       void replace_meter (const MeterSection&, const Meter&, const Timecode::BBT_Time& where, PositionLockStyle pls);
+       void replace_meter (const MeterSection&, const Meter&, const Timecode::BBT_Time& where, framepos_t frame, PositionLockStyle pls);
 
        framepos_t round_to_bar  (framepos_t frame, RoundMode dir);
        framepos_t round_to_beat (framepos_t frame, RoundMode dir);
@@ -569,7 +577,7 @@ private:
        TempoSection* add_tempo_locked (const Tempo&, double pulse, double minute
                               , TempoSection::Type type, PositionLockStyle pls, bool recompute, bool locked_to_meter = false);
 
-       MeterSection* add_meter_locked (const Meter&, double beat, const Timecode::BBT_Time& where, PositionLockStyle pls, bool recompute);
+       MeterSection* add_meter_locked (const Meter&, double beat, const Timecode::BBT_Time& where, framepos_t frame, PositionLockStyle pls, bool recompute);
 
        bool remove_tempo_locked (const TempoSection&);
        bool remove_meter_locked (const MeterSection&);

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index f5b75eb5ee80566082daa2bb1313cc263c0e5a2e..b1befabd51a2e525bb9a195991047f9068913cef 100644 (file)
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -1015,15 +1015,24 @@ TempoMap::do_insert (MetricSection* section)
                MeterSection* const insert_meter = dynamic_cast<MeterSection*> (section);
                TempoSection* const insert_tempo = dynamic_cast<TempoSection*> (section);
                Metrics::iterator i;
+
                if (insert_meter) {
+                       TempoSection* prev_t = 0;
+
                        for (i = _metrics.begin(); i != _metrics.end(); ++i) {
                                MeterSection* const meter = dynamic_cast<MeterSection*> (*i);
+                               bool const ipm = insert_meter->position_lock_style() == MusicTime;
 
                                if (meter) {
-                                       bool const ipm = insert_meter->position_lock_style() == MusicTime;
                                        if ((ipm && meter->beat() > insert_meter->beat()) || (!ipm && meter->frame() > insert_meter->frame())) {
                                                break;
                                        }
+                               } else {
+                                       if (prev_t && prev_t->locked_to_meter() && (!ipm && prev_t->frame() == insert_meter->frame())) {
+                                               break;
+                                       }
+
+                                       prev_t = dynamic_cast<TempoSection*> (*i);
                                }
                        }
                } else if (insert_tempo) {
@@ -1032,7 +1041,10 @@ TempoMap::do_insert (MetricSection* section)
 
                                if (tempo) {
                                        bool const ipm = insert_tempo->position_lock_style() == MusicTime;
-                                       if ((ipm && tempo->pulse() > insert_tempo->pulse()) || (!ipm && tempo->frame() > insert_tempo->frame())) {
+                                       const bool tpm = tempo->position_lock_style() == MusicTime;
+                                       const bool lm = insert_tempo->locked_to_meter();
+                                       if ((ipm && tempo->pulse() > insert_tempo->pulse()) || (!ipm && tempo->frame() > insert_tempo->frame())
+                                           || (lm && tempo->pulse() > insert_tempo->pulse())) {
                                                break;
                                        }
                                }
@@ -1113,12 +1125,12 @@ TempoMap::add_tempo_locked (const Tempo& tempo, double pulse, double minute
 }
 
 MeterSection*
-TempoMap::add_meter (const Meter& meter, const double& beat, const Timecode::BBT_Time& where, PositionLockStyle pls)
+TempoMap::add_meter (const Meter& meter, const double& beat, const Timecode::BBT_Time& where, framepos_t frame, PositionLockStyle pls)
 {
        MeterSection* m = 0;
        {
                Glib::Threads::RWLock::WriterLock lm (lock);
-               m = add_meter_locked (meter, beat, where, pls, true);
+               m = add_meter_locked (meter, beat, where, frame, pls, true);
        }
 
 
@@ -1133,7 +1145,7 @@ TempoMap::add_meter (const Meter& meter, const double& beat, const Timecode::BBT
 }
 
 void
-TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_Time& where, PositionLockStyle pls)
+TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_Time& where, framepos_t frame, PositionLockStyle pls)
 {
        {
                Glib::Threads::RWLock::WriterLock lm (lock);
@@ -1141,7 +1153,7 @@ TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_T
 
                if (!ms.initial()) {
                        remove_meter_locked (ms);
-                       add_meter_locked (meter, beat, where, pls, true);
+                       add_meter_locked (meter, beat, where, frame, pls, true);
                } else {
                        MeterSection& first (first_meter());
                        TempoSection& first_t (first_tempo());
@@ -1163,7 +1175,7 @@ TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_T
 }
 
 MeterSection*
-TempoMap::add_meter_locked (const Meter& meter, double beat, const BBT_Time& where, PositionLockStyle pls, bool recompute)
+TempoMap::add_meter_locked (const Meter& meter, double beat, const BBT_Time& where, framepos_t frame, PositionLockStyle pls, bool recompute)
 {
        const MeterSection& prev_m = meter_section_at_minute_locked  (_metrics, minute_at_beat_locked (_metrics, beat) - minute_at_frame (1));
        const double pulse = ((where.bars - prev_m.bbt().bars) * (prev_m.divisions_per_bar() / prev_m.note_divisor())) + prev_m.pulse();
@@ -1172,7 +1184,7 @@ TempoMap::add_meter_locked (const Meter& meter, double beat, const BBT_Time& whe
 
        if (pls == AudioTime) {
                /* add meter-locked tempo */
-               mlt = add_tempo_locked (tempo_at_minute_locked (_metrics, time_minutes), pulse,  time_minutes, TempoSection::Ramp, AudioTime, true, true);
+               mlt = add_tempo_locked (tempo_at_minute_locked (_metrics, time_minutes), pulse, minute_at_frame (frame), TempoSection::Ramp, AudioTime, true, true);
 
                if (!mlt) {
                        return 0;
@@ -1180,7 +1192,8 @@ TempoMap::add_meter_locked (const Meter& meter, double beat, const BBT_Time& whe
 
        }
 
-       MeterSection* new_meter = new MeterSection (pulse, time_minutes, beat, where, meter.divisions_per_bar(), meter.note_divisor(), pls, _frame_rate);
+       MeterSection* new_meter = new MeterSection (pulse, minute_at_frame (frame), beat, where, meter.divisions_per_bar(), meter.note_divisor(), pls, _frame_rate);
+
        bool solved = false;
 
        do_insert (new_meter);
@@ -1188,7 +1201,13 @@ TempoMap::add_meter_locked (const Meter& meter, double beat, const BBT_Time& whe
        if (recompute) {
 
                if (pls == AudioTime) {
-                       solved = solve_map_minute (_metrics, new_meter, time_minutes);
+                       solved = solve_map_minute (_metrics, new_meter, minute_at_frame (frame));
+                       /* we failed, most likely due to some impossible frame requirement wrt audio-locked tempi.
+                          fudge frame so that the meter ends up at its BBT position instead.
+                       */
+                       if (!solved) {
+                               solved = solve_map_minute (_metrics, new_meter, minute_at_frame (prev_m.frame() + 1));
+                       }
                } else {
                        solved = solve_map_bbt (_metrics, new_meter, where);
                        /* required due to resetting the pulse of meter-locked tempi above.
@@ -2596,6 +2615,7 @@ TempoMap::solve_map_minute (Metrics& imaginary, TempoSection* section, const dou
        TempoSection* prev_t = 0;
        TempoSection* section_prev = 0;
        double first_m_minute = 0.0;
+       const bool sml = section->locked_to_meter();
 
        /* can't move a tempo before the first meter */
        for (Metrics::iterator i = imaginary.begin(); i != imaginary.end(); ++i) {
@@ -2623,12 +2643,10 @@ TempoMap::solve_map_minute (Metrics& imaginary, TempoSection* section, const dou
                        if (!t->active()) {
                                continue;
                        }
+
                        if (prev_t) {
+
                                if (t == section) {
-                                       section_prev = prev_t;
-                                       if (t->locked_to_meter()) {
-                                               prev_t = t;
-                                       }
                                        continue;
                                }
 
@@ -2636,6 +2654,20 @@ TempoMap::solve_map_minute (Metrics& imaginary, TempoSection* section, const dou
                                        return false;
                                }
 
+                               const bool tlm = t->position_lock_style() == MusicTime;
+
+                               if (prev_t && !section_prev && ((sml && tlm && t->pulse() > section->pulse()) || (!tlm && t->minute() > minute))) {
+                                       section_prev = prev_t;
+
+                                       if (t->locked_to_meter()) {
+                                               section_prev->set_c_func (section_prev->compute_c_func_minute (section->note_types_per_minute(), minute));
+                                               if (!section->locked_to_meter()) {
+                                                       section->set_pulse (section_prev->pulse_at_ntpm (section->note_types_per_minute(), minute));
+                                               }
+                                               prev_t = section;
+                                       }
+                               }
+
                                if (t->position_lock_style() == MusicTime) {
                                        prev_t->set_c_func (prev_t->compute_c_func_pulse (t->note_types_per_minute(), t->pulse()));
                                        t->set_minute (prev_t->minute_at_ntpm (t->note_types_per_minute(), t->pulse()));
@@ -2776,7 +2808,7 @@ TempoMap::solve_map_minute (Metrics& imaginary, MeterSection* section, const dou
                TempoSection* t;
                if ((*ii)->is_tempo()) {
                        t = static_cast<TempoSection*> (*ii);
-                       if ((t->locked_to_meter() || t->initial()) && t->minute() == section->minute()) {
+                       if ((t->locked_to_meter() || t->initial()) && t->frame() == section->frame()) {
                                meter_locked_tempo = t;
                                break;
                        }
@@ -2831,7 +2863,7 @@ TempoMap::solve_map_minute (Metrics& imaginary, MeterSection* section, const dou
                                                }
                                        } else {
                                                /* all is ok. set section's locked tempo if allowed.
-                                                  possibly disallowed if there is an adjacent audio-locked tempo.
+                                                  possibly disallow if there is an adjacent audio-locked tempo.
                                                   XX this check could possibly go. its never actually happened here.
                                                */
                                                MeterSection* meter_copy = const_cast<MeterSection*>

diff --git a/libs/ardour/test/bbt_test.cc b/libs/ardour/test/bbt_test.cc
index ec5aea91caffbd0c943cf20fc1063c09811a0248..c9daaa753b4445318f7ffe767bcdd22f770477f1 100644 (file)
--- a/libs/ardour/test/bbt_test.cc
+++ b/libs/ardour/test/bbt_test.cc
@@ -17,7 +17,7 @@ BBTTest::addTest ()
        Meter    meter(4.0, 4.0);
 
        /* no need to supply the frame for a new music-locked meter */
-       map.add_meter (meter, 4.0, BBT_Time(2, 1, 0), MusicTime);
+       map.add_meter (meter, 4.0, BBT_Time(2, 1, 0), 0, MusicTime);
 
        /* add some good stuff here */
 }

diff --git a/libs/ardour/test/framepos_plus_beats_test.cc b/libs/ardour/test/framepos_plus_beats_test.cc
index ab81777840255f9404144a8dcb79fa95c7dfc4c6..c59578772c98c9eb4e9ad0dc4c1ff41f3791fa69 100644 (file)
--- 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 */

diff --git a/libs/ardour/test/framewalk_to_beats_test.cc b/libs/ardour/test/framewalk_to_beats_test.cc
index 1ed044acf476e0abd99354a444aa6fa7ebbc150b..78d8c113eddc592f8ffb332624f20a82e5655d05 100644 (file)
--- a/libs/ardour/test/framewalk_to_beats_test.cc
+++ b/libs/ardour/test/framewalk_to_beats_test.cc
@@ -20,7 +20,7 @@ FramewalkToBeatsTest::singleTempoTest ()
        Tempo tempo (bpm, 4.0);
        Meter meter (4, 4);
 
-       map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), AudioTime);
+       map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), 0, AudioTime);
        map.replace_tempo (map.tempo_section_at_frame (0), tempo, 0.0, 0, TempoSection::Constant, AudioTime);
 
        /* Walk 1 beats-worth of frames from beat 3 */
@@ -47,7 +47,7 @@ FramewalkToBeatsTest::doubleTempoTest ()
 
        TempoMap map (sampling_rate);
        Meter meter (4, 4);
-       map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), AudioTime);
+       map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), 0, AudioTime);
 
        /*
          120bpm at bar 1, 240bpm at bar 4
@@ -104,7 +104,7 @@ FramewalkToBeatsTest::tripleTempoTest ()
 
        TempoMap map (sampling_rate);
        Meter meter (4, 4);
-       map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), AudioTime);
+       map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), 0, AudioTime);
 
        /*
          120bpm at bar 1, 240bpm at bar 2, 160bpm at bar 3
@@ -150,7 +150,7 @@ FramewalkToBeatsTest::singleTempoMeterTest ()
        Tempo tempo (bpm, 4.0);
        Meter meter (7, 8);
 
-       map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), AudioTime);
+       map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), 0, AudioTime);
        map.replace_tempo (map.tempo_section_at_frame (0), tempo, 0.0, 0, TempoSection::Constant, AudioTime);
 
        /* Walk 1 qn beats-worth of frames from beat 3 */

diff --git a/libs/ardour/test/midi_clock_slave_test.h b/libs/ardour/test/midi_clock_slave_test.h
index 48365e39df81a345f996401d80bc51a1b79cee7b..2a674aed108f749dc161d3c72f2b6804442375e1 100644 (file)
--- a/libs/ardour/test/midi_clock_slave_test.h
+++ b/libs/ardour/test/midi_clock_slave_test.h
@@ -49,7 +49,7 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy {
         {
           _tempo_map = new TempoMap (FRAME_RATE);
           _tempo_map->add_tempo (tempo, 0.0, 0, TempoSection::Constant, AudioTime);
-          _tempo_map->add_meter (meter, 0.0, Timecode::BBT_Time(1, 1, 0), AudioTime);
+          _tempo_map->add_meter (meter, 0.0, Timecode::BBT_Time(1, 1, 0), 0, AudioTime);
         }
 
         // Controlling the mock object

diff --git a/libs/ardour/test/tempo_test.cc b/libs/ardour/test/tempo_test.cc
index 6661074ba4389d6df3c3a277864086ac940801b4..52d7d4ea1fb6b3c94bfab97223855304a4c342f7 100644 (file)
--- a/libs/ardour/test/tempo_test.cc
+++ b/libs/ardour/test/tempo_test.cc
@@ -14,7 +14,7 @@ TempoTest::recomputeMapTest48 ()
 
        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
@@ -40,7 +40,7 @@ TempoTest::recomputeMapTest48 ()
        Tempo tempoB (240.0, 4.0);
        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), MusicTime);
+       map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 0, MusicTime);
        //map.dump (map._metrics, std::cout);
        list<MetricSection*>::iterator i = map._metrics.begin();
        CPPUNIT_ASSERT_EQUAL (framepos_t (0), (*i)->frame ());
@@ -112,7 +112,7 @@ TempoTest::recomputeMapTest44 ()
 
        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
@@ -138,7 +138,7 @@ TempoTest::recomputeMapTest44 ()
        Tempo tempoB (240.0, 4.0);
        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), MusicTime);
+       map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 288e3, MusicTime);
 
        list<MetricSection*>::iterator i = map._metrics.begin();
        CPPUNIT_ASSERT_EQUAL (framepos_t (0), (*i)->frame ());
@@ -212,7 +212,7 @@ TempoTest::qnDistanceTestConstant ()
 
        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
@@ -251,7 +251,7 @@ TempoTest::qnDistanceTestConstant ()
        map.add_tempo (tempoG, 0.0, (framepos_t) 2 * 60 * sampling_rate, TempoSection::Constant, AudioTime);
 
        Meter meterB (3, 4);
-       map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), MusicTime);
+       map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 288e3, MusicTime);
 
        list<MetricSection*>::iterator i = map._metrics.begin();
        CPPUNIT_ASSERT_EQUAL (framepos_t (0), (*i)->frame ());
@@ -292,7 +292,7 @@ TempoTest::qnDistanceTestRamp ()
 
        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
@@ -306,10 +306,10 @@ TempoTest::qnDistanceTestRamp ()
 
          120bpm                                                240bpm
          0 beats                                               12 beats
-         0 frames                                              288e3 frames
+         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 |
+         |                 |              |                 |                 |             |
+         | 1.1 1.2 1.3 1.4 |  -no music-  | 2.1 2.2 2.3.2.4 | 3.1 3.2 3.3 3.4 | 4.1 4.2 4.3 |
 
        */
 
@@ -329,7 +329,7 @@ TempoTest::qnDistanceTestRamp ()
        Tempo tempoG (111.8, 4.0);
        map.add_tempo (tempoG, 0.0, (framepos_t) 2 * 60 * sampling_rate, TempoSection::Ramp, AudioTime);
        Meter meterB (3, 4);
-       map.add_meter (meterB, 4.0, BBT_Time (2, 1, 0), AudioTime);
+       map.add_meter (meterB, 4.0, BBT_Time (2, 1, 0), 288e3, AudioTime);
        map.recompute_map (map._metrics, 1);
 
        list<MetricSection*>::iterator i = map._metrics.begin();
@@ -371,7 +371,7 @@ TempoTest::rampTest48 ()
        Tempo tempoB (217.0, 4.0);
        map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Ramp, AudioTime);
        map.add_tempo (tempoB, 0.0, (framepos_t) 60 * sampling_rate, TempoSection::Ramp, AudioTime);
-       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);
 
        /*
 
@@ -433,7 +433,7 @@ TempoTest::rampTest44 ()
        Tempo tempoB (217.0, 4.0);
        map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Ramp, AudioTime);
        map.add_tempo (tempoB, 0.0, (framepos_t) 60 * sampling_rate, TempoSection::Ramp, AudioTime);
-       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);
 
        /*
 
@@ -495,7 +495,7 @@ TempoTest::tempoAtPulseTest ()
        Tempo tempoB (160.0, 3.0);
        Tempo tempoC (123.0, 4.0);
 
-       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);
        map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Ramp, AudioTime);
 
        map.add_tempo (tempoB, 20.0, 0, TempoSection::Ramp, MusicTime);
@@ -568,7 +568,7 @@ TempoTest::tempoFundamentalsTest ()
        Tempo tempoD (160.0, 2.0);
        Tempo tempoE (123.0, 3.0);
 
-       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);
        map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Constant, AudioTime);
 
        map.add_tempo (tempoB, 20.0, 0, TempoSection::Constant, MusicTime);