Another engine dialog edge-case fix to set the samplerate

[ardour.git] / gtk2_ardour / editor_tempodisplay.cc

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index df4613f7be690549674b91b9dc29dff042bd0797..4630f1fe43829b48447b106499baab2b5d7d7571 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -326,10 +326,10 @@ Editor::compute_current_bbt_points (std::vector<TempoMap::BBTPoint>& grid, sampl
        const double lower_beat = floor (max (0.0, _session->tempo_map().beat_at_sample (leftmost))) - 1.0;
        switch (bbt_ruler_scale) {
 
-       case bbt_show_beats:
-       case bbt_show_ticks:
-       case bbt_show_ticks_detail:
-       case bbt_show_ticks_super_detail:
+       case bbt_show_quarters:
+       case bbt_show_eighths:
+       case bbt_show_sixteenths:
+       case bbt_show_thirtyseconds:
                _session->tempo_map().get_grid (grid, max (_session->tempo_map().sample_at_beat (lower_beat), (samplepos_t) 0), rightmost);
                break;
 
@@ -380,10 +380,10 @@ Editor::maybe_draw_grid_lines ()
 
        if ( grid_musical() ) {
                 metric_get_bbt (grid_marks, _leftmost_sample, rightmost_sample, 12);
-       } else if (_grid_type== GridTypeSmpte) {
+       } else if (_grid_type== GridTypeTimecode) {
                 metric_get_timecode (grid_marks, _leftmost_sample, rightmost_sample, 12);
-       } else if (_grid_type == GridTypeSamples) {
-               metric_get_samples (grid_marks, _leftmost_sample, rightmost_sample, 12);
+       } else if (_grid_type == GridTypeCDFrame) {
+               metric_get_minsec (grid_marks, _leftmost_sample, rightmost_sample, 12);
        } else if (_grid_type == GridTypeMinSec) {
                metric_get_minsec (grid_marks, _leftmost_sample, rightmost_sample, 12);
        }