enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
[ardour.git] / gtk2_ardour / editor_rulers.cc
index 0fc49f522b9fc5319f56b2282addd82c1ff879a2..868b00690083be3eca49a8b14ed4049d79a65a9e 100644 (file)
@@ -51,8 +51,9 @@
 #include "time_axis_view.h"
 #include "editor_drag.h"
 #include "editor_cursors.h"
+#include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -123,13 +124,13 @@ Editor::initialize_rulers ()
 {
        ruler_grabbed_widget = 0;
 
-       Pango::FontDescription font (ARDOUR_UI::config()->get_SmallerFont());
+       Pango::FontDescription font (UIConfiguration::instance().get_SmallerFont());
 
        _timecode_metric = new TimecodeMetric (this);
        _bbt_metric = new BBTMetric (this);
        _minsec_metric = new MinsecMetric (this);
        _samples_metric = new SamplesMetric (this);
-       
+
        timecode_ruler = new ArdourCanvas::Ruler (_time_markers_group, *_timecode_metric,
                                                  ArdourCanvas::Rect (0, 0, ArdourCanvas::COORD_MAX, timebar_height));
        timecode_ruler->set_font_description (font);
@@ -174,7 +175,7 @@ Editor::initialize_rulers ()
        minsec_ruler->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_event), minsec_ruler, MinsecRulerItem));
        bbt_ruler->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_event), bbt_ruler, BBTRulerItem));
        samples_ruler->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_event), samples_ruler, SamplesRulerItem));
-       
+
        visible_timebars = 0; /*this will be changed below */
 }
 
@@ -208,29 +209,27 @@ Editor::popup_ruler_menu (framepos_t where, ItemType t)
 
        switch (t) {
        case MarkerBarItem:
-               ruler_items.push_back (MenuElem (_("New location marker"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, false, false)));
+               ruler_items.push_back (MenuElem (_("New location marker"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, false)));
                ruler_items.push_back (MenuElem (_("Clear all locations"), sigc::mem_fun(*this, &Editor::clear_markers)));
                ruler_items.push_back (MenuElem (_("Unhide locations"), sigc::mem_fun(*this, &Editor::unhide_markers)));
-               ruler_items.push_back (SeparatorElem ());
                break;
+
        case RangeMarkerBarItem:
                ruler_items.push_back (MenuElem (_("New range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_range), where)));
                ruler_items.push_back (MenuElem (_("Clear all ranges"), sigc::mem_fun(*this, &Editor::clear_ranges)));
                ruler_items.push_back (MenuElem (_("Unhide ranges"), sigc::mem_fun(*this, &Editor::unhide_ranges)));
-               ruler_items.push_back (SeparatorElem ());
-
                break;
+
        case TransportMarkerBarItem:
-               ruler_items.push_back (MenuElem (_("Make Loop range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_loop), where)));
-               ruler_items.push_back (MenuElem (_("Make Punch range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_punch), where)));
+               ruler_items.push_back (MenuElem (_("New Loop range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_loop), where)));
+               ruler_items.push_back (MenuElem (_("New Punch range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_punch), where)));
                break;
 
        case CdMarkerBarItem:
                // TODO
-               ruler_items.push_back (MenuElem (_("New CD track marker"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, true, false)));
+               ruler_items.push_back (MenuElem (_("New CD track marker"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, true)));
                break;
 
-
        case TempoBarItem:
                ruler_items.push_back (MenuElem (_("New Tempo"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_tempo_event), where)));
                break;
@@ -314,7 +313,7 @@ Editor::store_ruler_visibility ()
 void
 Editor::restore_ruler_visibility ()
 {
-       XMLProperty* prop;
+       XMLProperty const * prop;
        XMLNode * node = _session->extra_xml (X_("RulerVisibility"));
 
        no_ruler_shown_update = true;
@@ -440,7 +439,7 @@ Editor::update_ruler_visibility ()
        double tbgpos = 0.0;
        double old_unit_pos;
 
-#ifdef GTKOSX
+#ifdef __APPLE__
        /* gtk update probs require this (damn) */
        meter_label.hide();
        tempo_label.hide();
@@ -541,7 +540,7 @@ Editor::update_ruler_visibility ()
                tempo_label.hide();
        }
 
-       if (!Profile->get_sae() && ruler_range_action->get_active()) {
+       if (ruler_range_action->get_active()) {
                old_unit_pos = range_marker_group->position().y;
                if (tbpos != old_unit_pos) {
                        range_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
@@ -711,15 +710,13 @@ Editor::update_fixed_rulers ()
 }
 
 void
-Editor::update_tempo_based_rulers (ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
-                                   ARDOUR::TempoMap::BBTPointList::const_iterator& end)
+Editor::update_tempo_based_rulers (std::vector<TempoMap::BBTPoint>& grid)
 {
        if (_session == 0) {
                return;
        }
 
-       compute_bbt_ruler_scale (leftmost_frame, leftmost_frame+current_page_samples(),
-                                begin, end);
+       compute_bbt_ruler_scale (grid, leftmost_frame, leftmost_frame+current_page_samples());
 
        _bbt_metric->units_per_pixel = samples_per_pixel;
 
@@ -741,7 +738,7 @@ Editor::set_timecode_ruler_scale (framepos_t lower, framepos_t upper)
                return;
        }
 
-       fr = _session->frame_rate();        
+       fr = _session->frame_rate();
 
        if (lower > (spacer = (framepos_t) (128 * Editor::get_current_zoom ()))) {
                lower = lower - spacer;
@@ -815,7 +812,7 @@ Editor::set_timecode_ruler_scale (framepos_t lower, framepos_t upper)
        } else if (range <= 8 * 60 * 60 * fr) { /* 4 - 8 hrs*/
                timecode_ruler_scale = timecode_show_hours;
                timecode_mark_modulo = 1;
-               timecode_nmarks = 2 + 8; 
+               timecode_nmarks = 2 + 8;
        } else if (range <= 16 * 60 * 60 * fr) { /* 16-24 hrs*/
                timecode_ruler_scale = timecode_show_hours;
                timecode_mark_modulo = 1;
@@ -831,7 +828,7 @@ Editor::set_timecode_ruler_scale (framepos_t lower, framepos_t upper)
 
                    But in this case, where the range defined by lower and uppper can vary
                    substantially (basically anything from 24hrs+ to several billion years)
-                   trying to decide which tick marks to show does require us to know 
+                   trying to decide which tick marks to show does require us to know
                    about the available width.
                 */
 
@@ -1001,7 +998,7 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdou
                                 mark.position = pos;
                                 marks.push_back (mark);
                                 ++n;
-                        } 
+                        }
                         /* can't use Timecode::increment_hours() here because we may be traversing thousands of hours
                            and doing it 1 hour at a time is just stupid (and slow).
                         */
@@ -1012,19 +1009,25 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdou
 }
 
 void
-Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper,
-                                ARDOUR::TempoMap::BBTPointList::const_iterator begin,
-                                ARDOUR::TempoMap::BBTPointList::const_iterator end)
+Editor::compute_bbt_ruler_scale (std::vector<ARDOUR::TempoMap::BBTPoint>& grid, framepos_t lower, framepos_t upper)
 {
        if (_session == 0) {
                return;
        }
 
-       TempoMap::BBTPointList::const_iterator i;
+       std::vector<TempoMap::BBTPoint>::const_iterator i;
        Timecode::BBT_Time lower_beat, upper_beat; // the beats at each end of the ruler
+       double floor_lower_beat = floor(_session->tempo_map().beat_at_frame (lower));
+
+       if (floor_lower_beat < 0.0) {
+               floor_lower_beat = 0.0;
+       }
+
+       const framecnt_t beat_before_lower_pos = _session->tempo_map().frame_at_beat (floor_lower_beat);
+       const framecnt_t beat_after_upper_pos = _session->tempo_map().frame_at_beat (floor (_session->tempo_map().beat_at_frame (upper)) + 1.0);
 
-       _session->bbt_time (lower, lower_beat);
-       _session->bbt_time (upper, upper_beat);
+       _session->bbt_time (beat_before_lower_pos, lower_beat);
+       _session->bbt_time (beat_after_upper_pos, upper_beat);
        uint32_t beats = 0;
 
        bbt_accent_modulo = 1;
@@ -1104,56 +1107,58 @@ Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper,
                 bbt_beat_subdivision = 4;
                break;
        }
-
-       if (distance (begin, end) == 0) {
+       if (distance (grid.begin(), grid.end()) == 0) {
                return;
        }
 
-       i = end;
+       i = grid.end();
        i--;
-       if ((*i).beat >= (*begin).beat) {
-               bbt_bars = (*i).bar - (*begin).bar;
+
+       /* XX ?? */
+       if ((*i).beat >= (*grid.begin()).beat) {
+               bbt_bars = (*i).bar - (*grid.begin()).bar;
        } else {
-               bbt_bars = (*i).bar - (*begin).bar - 1;
+               bbt_bars = (*i).bar - (*grid.begin()).bar;
        }
-       beats = distance (begin, end) - bbt_bars;
 
+       beats = distance (grid.begin(), grid.end()) - bbt_bars;
+       double beat_density = ((distance (grid.begin(), grid.end()) + 1) * ((double) (upper - lower) / (double) (1 + grid.back().frame - grid.front().frame))) / 5.0;
        /* Only show the bar helper if there aren't many bars on the screen */
        if ((bbt_bars < 2) || (beats < 5)) {
                bbt_bar_helper_on = true;
        }
 
-       if (bbt_bars > 8192) {
-               bbt_ruler_scale =  bbt_show_many;
-       } else if (bbt_bars > 1024) {
+       if (beat_density > 8192) {
+               bbt_ruler_scale = bbt_show_many;
+       } else if (beat_density > 1024) {
                bbt_ruler_scale = bbt_show_64;
-       } else if (bbt_bars > 256) {
+       } else if (beat_density > 512) {
                bbt_ruler_scale = bbt_show_16;
-       } else if (bbt_bars > 64) {
+       } else if (beat_density > 128) {
                bbt_ruler_scale = bbt_show_4;
-       } else if (bbt_bars > 10) {
+       } else if (beat_density > 16) {
                bbt_ruler_scale =  bbt_show_1;
-       } else if (bbt_bars > 2) {
+       } else if (beat_density > 2) {
                bbt_ruler_scale =  bbt_show_beats;
-       } else  if (bbt_bars > 0) {
+       } else  if (beat_density > 0.5) {
                bbt_ruler_scale =  bbt_show_ticks;
        } else {
                bbt_ruler_scale =  bbt_show_ticks_detail;
        }
-       
-       if ((bbt_ruler_scale == bbt_show_ticks_detail) && (lower_beat.beats == upper_beat.beats) && (upper_beat.ticks - lower_beat.ticks <= Timecode::BBT_Time::ticks_per_beat / 4)) {
+
+       if ((bbt_ruler_scale == bbt_show_ticks_detail) && beats < 3) {
                bbt_ruler_scale =  bbt_show_ticks_super_detail;
        }
 }
 
-static void 
+static void
 edit_last_mark_label (std::vector<ArdourCanvas::Ruler::Mark>& marks, const std::string& newlabel)
 {
        ArdourCanvas::Ruler::Mark copy = marks.back();
        copy.label = newlabel;
        marks.pop_back ();
        marks.push_back (copy);
-}              
+}
 
 void
 Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble lower, gdouble upper, gint /*maxchars*/)
@@ -1162,38 +1167,34 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
                return;
        }
 
-       TempoMap::BBTPointList::const_iterator i;
+       std::vector<TempoMap::BBTPoint>::const_iterator i;
 
        char buf[64];
        gint  n = 0;
        framepos_t pos;
        Timecode::BBT_Time next_beat;
-       framepos_t next_beat_pos;
        uint32_t beats = 0;
        uint32_t tick = 0;
        uint32_t skip;
        uint32_t t;
-       framepos_t frame_skip;
-       double frame_skip_error;
        double bbt_position_of_helper;
-       double accumulated_error;
        bool i_am_accented = false;
        bool helper_active = false;
        ArdourCanvas::Ruler::Mark mark;
 
-       ARDOUR::TempoMap::BBTPointList::const_iterator begin;
-       ARDOUR::TempoMap::BBTPointList::const_iterator end;
+       std::vector<TempoMap::BBTPoint> grid;
 
-       compute_current_bbt_points (lower, upper, begin, end);
+       compute_current_bbt_points (grid, lower, upper);
 
-       if (distance (begin, end) == 0) {
+       if (distance (grid.begin(), grid.end()) == 0) {
                return;
        }
 
        switch (bbt_ruler_scale) {
 
        case bbt_show_beats:
-               beats = distance (begin, end);
+
+               beats = distance (grid.begin(), grid.end());
                bbt_nmarks = beats + 2;
 
                mark.label = "";
@@ -1201,7 +1202,7 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
                mark.style = ArdourCanvas::Ruler::Mark::Micro;
                marks.push_back (mark);
 
-               for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) {
+               for (n = 1, i = grid.begin(); n < bbt_nmarks && i != grid.end(); ++i) {
 
                        if ((*i).frame < lower && (bbt_bar_helper_on)) {
                                snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
@@ -1229,11 +1230,11 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
 
        case bbt_show_ticks:
 
-               beats = distance (begin, end);
+               beats = distance (grid.begin(), grid.end());
                bbt_nmarks = (beats + 2) * bbt_beat_subdivision;
 
                bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ());
-               
+
                // could do marks.assign() here to preallocate
 
                mark.label = "";
@@ -1241,7 +1242,7 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
                mark.style = ArdourCanvas::Ruler::Mark::Micro;
                marks.push_back (mark);
 
-               for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) {
+               for (n = 1, i = grid.begin(); n < bbt_nmarks && i != grid.end(); ++i) {
 
                        if ((*i).frame < lower && (bbt_bar_helper_on)) {
                                snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
@@ -1266,45 +1267,20 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
                        }
 
                        /* Add the tick marks */
+                       skip = Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision;
+                       tick = skip; // the first non-beat tick
+                       t = 0;
+                       while (tick < Timecode::BBT_Time::ticks_per_beat && (n < bbt_nmarks)) {
 
-                       /* Find the next beat */
-                       next_beat.beats = (*i).beat;
-                       next_beat.bars = (*i).bar;
-                       next_beat.ticks = 0;
-
-                       if ((*i).meter->divisions_per_bar() > (next_beat.beats + 1)) {
-                                 next_beat.beats += 1;
-                       } else {
-                                 next_beat.bars += 1;
-                                 next_beat.beats = 1;
-                       }
-
-                       next_beat_pos = _session->tempo_map().frame_time(next_beat);
-
-                       frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() *  60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
-                       frame_skip_error -= frame_skip;
-                       skip = (uint32_t) (Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision);
-
-                       pos = (*i).frame + frame_skip;
-                       accumulated_error = frame_skip_error;
+                               next_beat.beats = (*i).beat;
+                               next_beat.bars = (*i).bar;
+                               next_beat.ticks = tick;
+                               pos = _session->tempo_map().frame_at_bbt (next_beat);
 
-                       tick = skip;
-
-                       for (t = 0; (tick < Timecode::BBT_Time::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) {
-
-                               if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
+                               if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
                                        i_am_accented = true;
                                }
-
                                mark.label = "";
-
-                               /* Error compensation for float to framepos_t*/
-                               accumulated_error += frame_skip_error;
-                               if (accumulated_error > 1) {
-                                       pos += 1;
-                                       accumulated_error -= 1.0f;
-                               }
-
                                mark.position = pos;
 
                                if ((bbt_beat_subdivision > 4) && i_am_accented) {
@@ -1314,7 +1290,10 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
                                }
                                i_am_accented = false;
                                marks.push_back (mark);
-                               n++;
+
+                               tick += skip;
+                               ++t;
+                               ++n;
                        }
                }
 
@@ -1322,17 +1301,17 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
 
        case bbt_show_ticks_detail:
 
-               beats = distance (begin, end);
+               beats = distance (grid.begin(), grid.end());
                bbt_nmarks = (beats + 2) * bbt_beat_subdivision;
 
-               bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ());
+               bbt_position_of_helper = lower + (3 * Editor::get_current_zoom ());
 
                mark.label = "";
                mark.position = lower;
                mark.style = ArdourCanvas::Ruler::Mark::Micro;
                marks.push_back (mark);
 
-               for (n = 1,   i = begin; n < bbt_nmarks && i != end; ++i) {
+               for (n = 1,   i = grid.begin(); n < bbt_nmarks && i != grid.end(); ++i) {
 
                        if ((*i).frame < lower && (bbt_bar_helper_on)) {
                                snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
@@ -1357,36 +1336,20 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
                        }
 
                        /* Add the tick marks */
+                       skip = Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision;
+                       tick = skip; // the first non-beat tick
 
-                       /* Find the next beat */
-
-                       next_beat.beats = (*i).beat;
-                       next_beat.bars = (*i).bar;
-
-                       if ((*i).meter->divisions_per_bar() > (next_beat.beats + 1)) {
-                                 next_beat.beats += 1;
-                       } else {
-                                 next_beat.bars += 1;
-                                 next_beat.beats = 1;
-                       }
-
-                       next_beat_pos = _session->tempo_map().frame_time(next_beat);
-
-                       frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() *  60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
-                       frame_skip_error -= frame_skip;
-                       skip = (uint32_t) (Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision);
+                       t = 0;
+                       while (tick < Timecode::BBT_Time::ticks_per_beat && (n < bbt_nmarks)) {
 
-                       pos = (*i).frame + frame_skip;
-                       accumulated_error = frame_skip_error;
+                               next_beat.beats = (*i).beat;
+                               next_beat.bars = (*i).bar;
+                               next_beat.ticks = tick;
+                               pos = _session->tempo_map().frame_at_bbt (next_beat);
 
-                       tick = skip;
-
-                       for (t = 0; (tick < Timecode::BBT_Time::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) {
-
-                               if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
-                                       i_am_accented = true;
+                               if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
+                                       i_am_accented = true;
                                }
-
                                if (i_am_accented && (pos > bbt_position_of_helper)){
                                        snprintf (buf, sizeof(buf), "%" PRIu32, tick);
                                } else {
@@ -1394,14 +1357,6 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
                                }
 
                                mark.label = buf;
-
-                               /* Error compensation for float to framepos_t*/
-                               accumulated_error += frame_skip_error;
-                               if (accumulated_error > 1) {
-                                       pos += 1;
-                                       accumulated_error -= 1.0f;
-                               }
-
                                mark.position = pos;
 
                                if ((bbt_beat_subdivision > 4) && i_am_accented) {
@@ -1410,7 +1365,11 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
                                        mark.style = ArdourCanvas::Ruler::Mark::Micro;
                                }
                                i_am_accented = false;
-                               n++;
+                               marks.push_back (mark);
+
+                               tick += skip;
+                               ++t;
+                               ++n;
                        }
                }
 
@@ -1418,17 +1377,17 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
 
        case bbt_show_ticks_super_detail:
 
-               beats = distance (begin, end);
+               beats = distance (grid.begin(), grid.end());
                bbt_nmarks = (beats + 2) * bbt_beat_subdivision;
 
-               bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ());
+               bbt_position_of_helper = lower + (3 * Editor::get_current_zoom ());
 
                mark.label = "";
                mark.position = lower;
                mark.style = ArdourCanvas::Ruler::Mark::Micro;
                marks.push_back (mark);
 
-               for (n = 1,   i = begin; n < bbt_nmarks && i != end; ++i) {
+               for (n = 1,   i = grid.begin(); n < bbt_nmarks && i != grid.end(); ++i) {
 
                        if ((*i).frame < lower && (bbt_bar_helper_on)) {
                                  snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
@@ -1453,61 +1412,40 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
                        }
 
                        /* Add the tick marks */
-
-                       /* Find the next beat */
+                       skip = Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision;
 
                        next_beat.beats = (*i).beat;
                        next_beat.bars = (*i).bar;
+                       tick = skip; // the first non-beat tick
+                       t = 0;
+                       while (tick < Timecode::BBT_Time::ticks_per_beat && (n < bbt_nmarks)) {
 
-                       if ((*i).meter->divisions_per_bar() > (next_beat.beats + 1)) {
-                                 next_beat.beats += 1;
-                       } else {
-                                 next_beat.bars += 1;
-                                 next_beat.beats = 1;
-                       }
-
-                       next_beat_pos = _session->tempo_map().frame_time(next_beat);
-
-                       frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() *  60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
-                       frame_skip_error -= frame_skip;
-                       skip = (uint32_t) (Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision);
-
-                       pos = (*i).frame + frame_skip;
-                       accumulated_error = frame_skip_error;
-
-                       tick = skip;
-
-                       for (t = 0; (tick < Timecode::BBT_Time::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) {
-
-                                 if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
-                                         i_am_accented = true;
-                                 }
-
-                                 if (pos > bbt_position_of_helper) {
-                                         snprintf (buf, sizeof(buf), "%" PRIu32, tick);
-                                 } else {
-                                         buf[0] = '\0';
-                                 }
+                               next_beat.ticks = tick;
+                               pos = _session->tempo_map().frame_at_bbt (next_beat);
+                               if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
+                                       i_am_accented = true;
+                               }
 
-                                 mark.label = buf;
+                               if (pos > bbt_position_of_helper) {
+                                       snprintf (buf, sizeof(buf), "%" PRIu32, tick);
+                               } else {
+                                       buf[0] = '\0';
+                               }
 
-                                 /* Error compensation for float to framepos_t*/
-                                 accumulated_error += frame_skip_error;
-                                 if (accumulated_error > 1) {
-                                         pos += 1;
-                                         accumulated_error -= 1.0f;
-                                 }
+                               mark.label = buf;
+                               mark.position = pos;
 
-                                 mark.position = pos;
+                               if ((bbt_beat_subdivision > 4) && i_am_accented) {
+                                       mark.style = ArdourCanvas::Ruler::Mark::Minor;
+                               } else {
+                                       mark.style = ArdourCanvas::Ruler::Mark::Micro;
+                               }
+                               i_am_accented = false;
+                               marks.push_back (mark);
 
-                                 if ((bbt_beat_subdivision > 4) && i_am_accented) {
-                                         mark.style = ArdourCanvas::Ruler::Mark::Minor;
-                                 } else {
-                                         mark.style = ArdourCanvas::Ruler::Mark::Micro;
-                                 }
-                                 i_am_accented = false;
-                                 marks.push_back (mark);
-                                 n++;
+                               tick += skip;
+                               ++t;
+                               ++n;
                        }
                }
 
@@ -1524,7 +1462,7 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
 
        case bbt_show_64:
                        bbt_nmarks = (gint) (bbt_bars / 64) + 1;
-                       for (n = 0,   i = begin; i != end && n < bbt_nmarks; i++) {
+                       for (n = 0,   i = grid.begin(); i != grid.end() && n < bbt_nmarks; i++) {
                                if ((*i).is_bar()) {
                                        if ((*i).bar % 64 == 1) {
                                                if ((*i).bar % 256 == 1) {
@@ -1549,7 +1487,7 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
 
        case bbt_show_16:
                        bbt_nmarks = (bbt_bars / 16) + 1;
-               for (n = 0,  i = begin; i != end && n < bbt_nmarks; i++) {
+               for (n = 0,  i = grid.begin(); i != grid.end() && n < bbt_nmarks; i++) {
                        if ((*i).is_bar()) {
                          if ((*i).bar % 16 == 1) {
                                if ((*i).bar % 64 == 1) {
@@ -1574,7 +1512,7 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
 
        case bbt_show_4:
                bbt_nmarks = (bbt_bars / 4) + 1;
-               for (n = 0,   i = begin; i != end && n < bbt_nmarks; ++i) {
+               for (n = 0,   i = grid.begin(); i != grid.end() && n < bbt_nmarks; ++i) {
                        if ((*i).is_bar()) {
                          if ((*i).bar % 4 == 1) {
                                if ((*i).bar % 16 == 1) {
@@ -1600,7 +1538,7 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
        case bbt_show_1:
 //     default:
                bbt_nmarks = bbt_bars + 2;
-               for (n = 0,  i = begin; i != end && n < bbt_nmarks; ++i) {
+               for (n = 0,  i = grid.begin(); i != grid.end() && n < bbt_nmarks; ++i) {
                        if ((*i).is_bar()) {
                          if ((*i).bar % 4 == 1) {
                                        snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
@@ -1797,7 +1735,7 @@ Editor::set_minsec_ruler_scale (framepos_t lower, framepos_t upper)
 
                    But in this case, where the range defined by lower and uppper can vary
                    substantially (anything from 24hrs+ to several billion years)
-                   trying to decide which tick marks to show does require us to know 
+                   trying to decide which tick marks to show does require us to know
                    about the available width.
                 */
 
@@ -1852,7 +1790,7 @@ Editor::metric_get_minsec (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdoubl
                        marks.push_back (mark);
                }
                 break;
-                
+
        case minsec_show_seconds:
                for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) {
                        sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs);
@@ -1908,7 +1846,7 @@ Editor::metric_get_minsec (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdoubl
                        marks.push_back (mark);
                  }
                  break;
-                 
+
         case minsec_show_many_hours:
                 for (n = 0; n < minsec_nmarks; ) {
                         sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs);