From c67d1aca64fef971aba51d86eebf0542d63838d5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 12 Nov 2007 19:15:48 +0000 Subject: [PATCH] fix up issues with fade length setting; [ & ] now work on selected marker no matter what edit point preference is git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2626 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/audio_region_view.cc | 2 +- gtk2_ardour/editor_ops.cc | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 44330e0af5..77db77beac 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -496,7 +496,7 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width) } else { handle_center = 3.0; } - + fade_in_handle->property_x1() = handle_center - 3.0; fade_in_handle->property_x2() = handle_center + 3.0; diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index df5919154d..866ce58373 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -797,7 +797,7 @@ Editor::edit_point_to_region_point (RegionPoint point, int32_t dir) Location* loc; bool ignored; - if (!session || _edit_point != EditAtSelectedMarker || selection->markers.empty()) { + if (!session || selection->markers.empty()) { return; } @@ -3861,11 +3861,11 @@ Editor::set_fade_length (bool in) char* cmd; if (in) { - if (pos <= rv->region()->start()) { + if (pos <= rv->region()->position()) { /* can't do it */ return; } - len = pos - rv->region()->start(); + len = pos - rv->region()->position(); cmd = _("set fade in length"); } else { if (pos >= rv->region()->last_frame()) { @@ -3878,8 +3878,6 @@ Editor::set_fade_length (bool in) begin_reversible_command (cmd); - cerr << "start " << cmd << " with len = " << len << endl; - RegionSelection& rs (get_regions_for_action()); for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {