From a699a637e44e6a4f59488868a031667d2a283c8e Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 26 Feb 2018 18:52:28 -0600 Subject: [PATCH] Switch CDFrame grid to use MinSec ruler rather than Sample ruler. --- gtk2_ardour/editor.cc | 4 ++-- gtk2_ardour/editor_tempodisplay.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 6a2f9561f9..60e0ab4a97 100644 --- 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 0cb646be50..fa2b821c24 100644 --- 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); }