more fun and games with meter and the tempo map: rename Meter::beats_per_bar() to...

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index e98a63b6a038d39c2f2fe87d66a594f0a22d27e9..d4e0e60ef80e1e3da441f7f08f9a9433562fec48 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3745,7 +3745,7 @@ Editor::get_grid_type_as_beats (bool& success, framepos_t position)
 
        case SnapToBar:
                if (_session) {
-                       return _session->tempo_map().meter_at (position).beats_per_bar();
+                       return _session->tempo_map().meter_at (position).divisions_per_bar();
                }
                break;
 
@@ -4349,15 +4349,10 @@ struct EditorOrderTimeAxisSorter {
 };
 
 void
-Editor::sort_track_selection (TrackViewList* sel)
+Editor::sort_track_selection (TrackViewList& sel)
 {
        EditorOrderTimeAxisSorter cmp;
-
-       if (sel) {
-               sel->sort (cmp);
-       } else {
-               selection->tracks.sort (cmp);
-       }
+       sel.sort (cmp);
 }
 
 framepos_t