summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-09-02 05:11:54 +1000
committernick_m <mainsbridge@gmail.com>2016-09-02 05:11:54 +1000
commite689182a6a0155e789b9b7dbd58a96f4a6ed0d5e (patch)
treeeeda4d8b427f9d62d3237dd5dbcd84ab040d9416 /gtk2_ardour
parent46858a292512b47d5adf7af3e028241621e85f5f (diff)
Editor::get_grid_type_as_beats() returns the quarter note equivalent of BBT beat and bar.
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 36309305e7..b283ed3498 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4105,10 +4105,11 @@ Editor::get_grid_type_as_beats (bool& success, framepos_t position)
switch (_snap_type) {
case SnapToBeat:
- return Evoral::Beats(1.0);
+ return Evoral::Beats(4.0 / _session->tempo_map().meter_at_frame (position).note_divisor());
case SnapToBar:
if (_session) {
- return Evoral::Beats(_session->tempo_map().meter_at_frame (position).divisions_per_bar());
+ const Meter& m = _session->tempo_map().meter_at_frame (position);
+ return Evoral::Beats((4.0 * m.divisions_per_bar()) / m.note_divisor());
}
break;
default: