From 2292e33ee418070c4d12971a72e01eb29dfc8de9 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Thu, 13 Dec 2012 16:42:05 +0000 Subject: crossfade hack and slash. removed overlap checks, overlap mode, default length, fade_is_xfade, fade_is_short, and other leftovers from previous crossfade models. Draw crossfade drags in realtime so fade_line is no longer needed. remove code for hiding crossfades during a drag. moved crossfade rect to top layer so crossfade lines dont grab mouse focus. drag-trim-with-fixed-fade-anchor is partially implemented and needs discussion git-svn-id: svn://localhost/ardour2/branches/3.0@13659 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/region_view.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour/region_view.cc') diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 312666c18a..8ea84409cc 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -834,11 +834,11 @@ RegionView::update_coverage_frames (LayerDisplay d) } } -void +bool RegionView::trim_front (framepos_t new_bound, bool no_overlap) { if (_region->locked()) { - return; + return false; } RouteTimeAxisView& rtv = dynamic_cast (trackview); @@ -866,13 +866,15 @@ RegionView::trim_front (framepos_t new_bound, bool no_overlap) } region_changed (ARDOUR::bounds_change); + + return (pre_trim_first_frame != _region->first_frame()); //return true if we actually changed something } -void +bool RegionView::trim_end (framepos_t new_bound, bool no_overlap) { if (_region->locked()) { - return; + return false; } RouteTimeAxisView& rtv = dynamic_cast (trackview); @@ -903,6 +905,8 @@ RegionView::trim_end (framepos_t new_bound, bool no_overlap) } else { region_changed (PropertyChange (ARDOUR::Properties::length)); } + + return (pre_trim_last_frame != _region->last_frame()); //return true if we actually changed something } -- cgit v1.2.3