Only show user-presets in favorite sidebar

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 4362b579d1e5f1ad5fda596e3e63c91f06d4dd51..7a528929a8143453a4b759e6cee6f71d6c30ce3f 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -63,6 +63,7 @@
 #include "ardour/session_playlists.h"
 #include "ardour/strip_silence.h"
 #include "ardour/transient_detector.h"
+#include "ardour/transport_master_manager.h"
 #include "ardour/transpose.h"
 #include "ardour/vca_manager.h"
 
@@ -109,6 +110,7 @@
 #include "transpose_dialog.h"
 #include "transform_dialog.h"
 #include "ui_config.h"
+#include "utils.h"
 #include "vca_time_axis.h"
 
 #include "pbd/i18n.h"
@@ -730,15 +732,10 @@ Editor::build_region_boundary_cache ()
        }
 
        /* if no snap selections are set, boundary cache should be left empty */
-       if ( interesting_points.empty() ) {
-               return;
-       }
-
-       /* if no snap boundaries were set,  just bail out here with an empty region cache */
        if ( interesting_points.empty() ) {
                _region_boundary_cache_dirty = false;
                return;
-       };
+       }
 
        TimeAxisView *ontrack = 0;
        TrackViewList tlist;
@@ -2600,7 +2597,7 @@ Editor::transition_to_rolling (bool fwd)
        }
 
        if (_session->config.get_external_sync()) {
-               switch (Config->get_sync_source()) {
+               switch (TransportMasterManager::instance().current()->type()) {
                case Engine:
                        break;
                default:
@@ -7310,7 +7307,7 @@ Editor::playhead_forward_to_grid ()
 
                if (pos.sample < max_samplepos - 1) {
                        pos.sample += 2;
-                       snap_to_internal (pos, RoundUpAlways, SnapToGrid_Scaled, true);
+                       pos = snap_to_grid (pos, RoundUpAlways, SnapToGrid_Scaled);
                        _session->request_locate (pos.sample);
                }
        }
@@ -7343,14 +7340,14 @@ Editor::playhead_backward_to_grid ()
 
                if (pos.sample > 2) {
                        pos.sample -= 2;
-                       snap_to_internal (pos, RoundDownAlways, SnapToGrid_Scaled, true);
+                       pos = snap_to_grid (pos, RoundDownAlways, SnapToGrid_Scaled);
                }
 
                //handle the case where we are rolling, and we're less than one-half second past the mark, we want to go to the prior mark...
                //also see:  jump_backward_to_mark
                if (_session->transport_rolling()) {
                        if ((playhead_cursor->current_sample() - pos.sample) < _session->sample_rate()/2) {
-                               snap_to_internal (pos, RoundDownAlways, SnapToGrid_Scaled, true);
+                               pos = snap_to_grid (pos, RoundDownAlways, SnapToGrid_Scaled);
                        }
                }
 
@@ -7424,6 +7421,10 @@ Editor::_remove_tracks ()
                return;
        }
 
+       if (!ARDOUR_UI_UTILS::engine_is_running ()) {
+               return;
+       }
+
        vector<string> choices;
        string prompt;
        int ntracks = 0;