diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2020-03-30 17:21:39 -0600 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2020-03-30 17:25:07 -0600 |
| commit | 6fec78221f07fc9ab0d687580ce2d9c5f97ef83b (patch) | |
| tree | 2c508db14fed07d816023b95badf5ccdbdba2be3 /gtk2_ardour/editor.cc | |
| parent | ff08fbb969c75adabb1bf59b402d0a76c59fa42b (diff) | |
use const ref to UIConfiguration::instance() to shorten lines a bit
Diffstat (limited to 'gtk2_ardour/editor.cc')
| -rw-r--r-- | gtk2_ardour/editor.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 0137fa0839..ba01d4e018 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2984,11 +2984,11 @@ Editor::snap_to_internal (MusicSample& start, RoundMode direction, SnapPref pref check_best_snap(presnap, test, dist, best); } + const UIConfiguration& uic (UIConfiguration::instance()); + /* check snap-to-region-{start/end/sync} */ - if ( - (pref == SnapToAny_Visual) && - (UIConfiguration::instance().get_snap_to_region_start() || UIConfiguration::instance().get_snap_to_region_end() || UIConfiguration::instance().get_snap_to_region_sync()) - ) { + if ((pref == SnapToAny_Visual) && (uic.get_snap_to_region_start() || uic.get_snap_to_region_end() || uic.get_snap_to_region_sync())) { + if (!region_boundary_cache.empty()) { vector<samplepos_t>::iterator prev = region_boundary_cache.begin(); @@ -3016,17 +3016,18 @@ Editor::snap_to_internal (MusicSample& start, RoundMode direction, SnapPref pref } /* check Grid */ - if (UIConfiguration::instance().get_snap_to_grid() && (_grid_type != GridTypeNone)) { + if (uic.get_snap_to_grid() && (_grid_type != GridTypeNone)) { MusicSample pre(presnap, 0); MusicSample post = snap_to_grid (pre, direction, pref); check_best_snap(presnap, post.sample, dist, best); + cerr << best << endl; } /* now check "magnetic" state: is the grid within reasonable on-screen distance to trigger a snap? * this also helps to avoid snapping to somewhere the user can't see. (i.e.: I clicked on a region and it disappeared!!) * ToDo: Perhaps this should only occur if EditPointMouse? */ - int snap_threshold_s = pixel_to_sample(UIConfiguration::instance().get_snap_threshold()); + int snap_threshold_s = pixel_to_sample (uic.get_snap_threshold()); if (ensure_snap) { start.set (best, 0); return; |