Fix long-standing spelling bug.

[ardour.git] / libs / ardour / tempo.cc

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 2d1c10f73ed56ea32c79b1526186fa0d088a939b..674cd189a1085cbffdf92eae9ef50086810152f4 100644 (file)
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -980,18 +980,23 @@ TempoMap::add_tempo_locked (const Tempo& tempo, double pulse, framepos_t frame
 {
        TempoSection* t = new TempoSection (pulse, frame, tempo.beats_per_minute(), tempo.note_type(), type, pls);
        t->set_locked_to_meter (locked_to_meter);
-
+       bool solved = false;
        do_insert (t);
 
        if (recompute) {
                if (pls == AudioTime) {
-                       solve_map_frame (_metrics, t, t->frame());
+                       solved = solve_map_frame (_metrics, t, t->frame());
                } else {
-                       solve_map_pulse (_metrics, t, t->pulse());
+                       solved = solve_map_pulse (_metrics, t, t->pulse());
                }
                recompute_meters (_metrics);
        }
 
+       if (!solved && recompute) {
+               remove_tempo_locked (*t);
+               return 0;
+       }
+
        return t;
 }
 
@@ -1046,29 +1051,46 @@ TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_T
 }
 
 MeterSection*
-TempoMap::add_meter_locked (const Meter& meter, double beat, const Timecode::BBT_Time& where, framepos_t frame, 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_frame_locked  (_metrics, frame - 1);
        const double pulse = ((where.bars - prev_m.bbt().bars) * (prev_m.divisions_per_bar() / prev_m.note_divisor())) + prev_m.pulse();
+       TempoSection* mlt = 0;
 
        if (pls == AudioTime) {
                /* add meter-locked tempo */
-               add_tempo_locked (tempo_at_frame_locked (_metrics, frame), pulse,  frame, TempoSection::Ramp, AudioTime, true, true);
+               mlt = add_tempo_locked (tempo_at_frame_locked (_metrics, frame), pulse,  frame, TempoSection::Ramp, AudioTime, true, true);
+
+               if (!mlt) {
+                       return 0;
+               }
+
        }
 
        MeterSection* new_meter = new MeterSection (pulse, frame, beat, where, meter.divisions_per_bar(), meter.note_divisor(), pls);
+       bool solved = false;
 
        do_insert (new_meter);
 
        if (recompute) {
 
                if (pls == AudioTime) {
-                       solve_map_frame (_metrics, new_meter, frame);
+                       solved = solve_map_frame (_metrics, new_meter, frame);
                } else {
-                       solve_map_bbt (_metrics, new_meter, where);
+                       solved = solve_map_bbt (_metrics, new_meter, where);
+                       /* required due to resetting the pulse of meter-locked tempi above.
+                          Arguably  solve_map_bbt() should use solve_map_pulse (_metrics, TempoSection) instead,
+                          but afaict this cannot cause the map to be left unsolved (these tempi are all audio locked).
+                       */
+                       recompute_map (_metrics);
                }
        }
 
+       if (!solved && recompute) {
+               remove_meter_locked (*new_meter);
+               return 0;
+       }
+
        return new_meter;
 }
 
@@ -1224,7 +1246,7 @@ TempoMap::first_tempo ()
        return *t;
 }
 void
-TempoMap::recompute_tempos (Metrics& metrics)
+TempoMap::recompute_tempi (Metrics& metrics)
 {
        TempoSection* prev_t = 0;
 
@@ -1364,7 +1386,7 @@ TempoMap::recompute_map (Metrics& metrics, framepos_t end)
                return;
        }
 
-       recompute_tempos (metrics);
+       recompute_tempi (metrics);
        recompute_meters (metrics);
 }
 
@@ -2192,7 +2214,7 @@ TempoMap::solve_map_frame (Metrics& imaginary, TempoSection* section, const fram
        }
 
 #if (0)
-       recompute_tempos (imaginary);
+       recompute_tempi (imaginary);
 
        if (check_solved (imaginary)) {
                return true;
@@ -2204,7 +2226,7 @@ TempoMap::solve_map_frame (Metrics& imaginary, TempoSection* section, const fram
        MetricSectionFrameSorter fcmp;
        imaginary.sort (fcmp);
 
-       recompute_tempos (imaginary);
+       recompute_tempi (imaginary);
 
        if (check_solved (imaginary)) {
                return true;
@@ -2258,7 +2280,7 @@ TempoMap::solve_map_pulse (Metrics& imaginary, TempoSection* section, const doub
        }
 
 #if (0)
-       recompute_tempos (imaginary);
+       recompute_tempi (imaginary);
 
        if (check_solved (imaginary)) {
                return true;
@@ -2270,7 +2292,7 @@ TempoMap::solve_map_pulse (Metrics& imaginary, TempoSection* section, const doub
        MetricSectionSorter cmp;
        imaginary.sort (cmp);
 
-       recompute_tempos (imaginary);
+       recompute_tempi (imaginary);
        /* Reordering
         * XX need a restriction here, but only for this case,
         * as audio locked tempos don't interact in the same way.
@@ -2740,7 +2762,7 @@ TempoMap::gui_move_meter (MeterSection* ms, const framepos_t& frame)
 
                        if (solve_map_frame (future_map, copy, frame)) {
                                solve_map_frame (_metrics, ms, frame);
-                               recompute_tempos (_metrics);
+                               recompute_tempi (_metrics);
                        }
                }
        } else {
@@ -2753,7 +2775,7 @@ TempoMap::gui_move_meter (MeterSection* ms, const framepos_t& frame)
 
                        if (solve_map_bbt (future_map, copy, bbt)) {
                                solve_map_bbt (_metrics, ms, bbt);
-                               recompute_tempos (_metrics);
+                               recompute_tempi (_metrics);
                        }
                }
        }
@@ -2776,7 +2798,7 @@ TempoMap::gui_change_tempo (TempoSection* ts, const Tempo& bpm)
                Glib::Threads::RWLock::WriterLock lm (lock);
                TempoSection* tempo_copy = copy_metrics_and_point (_metrics, future_map, ts);
                tempo_copy->set_beats_per_minute (bpm.beats_per_minute());
-               recompute_tempos (future_map);
+               recompute_tempi (future_map);
 
                if (check_solved (future_map)) {
                        ts->set_beats_per_minute (bpm.beats_per_minute());
@@ -2925,12 +2947,12 @@ TempoMap::gui_dilate_tempo (TempoSection* ts, const framepos_t& frame, const fra
                }
                new_bpm = min (new_bpm, (double) 1000.0);
                prev_t->set_beats_per_minute (new_bpm);
-               recompute_tempos (future_map);
+               recompute_tempi (future_map);
                recompute_meters (future_map);
 
                if (check_solved (future_map)) {
                        ts->set_beats_per_minute (new_bpm);
-                       recompute_tempos (_metrics);
+                       recompute_tempi (_metrics);
                        recompute_meters (_metrics);
                }
        }