Switch CDFrame grid to use MinSec ruler rather than Sample ruler.

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 6a2f9561f9442e9db31b05a12dbd7871005ff1a6..60e0ab4a9748fbc132cb64d5643e970b26b61bca 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2268,10 +2268,10 @@ Editor::set_grid_to (GridType gt)
 
                ruler_bbt_action->set_active(false);
                ruler_timecode_action->set_active(false);
-               ruler_minsec_action->set_active(false);
+               ruler_minsec_action->set_active(true);
 
                ruler_cd_marker_action->set_active(true);
-               ruler_samples_action->set_active(true);
+               ruler_samples_action->set_active(false);
        }
 
        instant_save ();

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 0cb646be503630cb4b1ccea9ef7bd2a6c657d768..fa2b821c24c64b003b4f7494b2be26e36e389fbb 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -383,7 +383,7 @@ Editor::maybe_draw_grid_lines ()
        } else if (_grid_type== GridTypeTimecode) {
                 metric_get_timecode (grid_marks, _leftmost_sample, rightmost_sample, 12);
        } else if (_grid_type == GridTypeCDFrame) {
-               metric_get_samples (grid_marks, _leftmost_sample, rightmost_sample, 12);
+               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);
        }