Editor::get_grid_type_as_beats() returns the quarter note equivalent of BBT beat...

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 36309305e7393a3060716165162ad89249a6e5f3..b283ed3498056b59ac8407ece87950c8b567d29c 100644 (file)
--- 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: