Remove unnecessary _have_transaction flag in TrimDrag. Fix undo when a trim of one...
[ardour.git] / gtk2_ardour / region_view.cc
index b8ebc8fe8940e57ce86ab1fc9b9a6078a3e8a575..5163b65287589a45e463194ef16a976ab846dd57 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001-2006 Paul Davis 
+    Copyright (C) 2001-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 #include <gtkmm.h>
 
 #include <gtkmm2ext/gtk_ui.h>
-#include "pbd/stacktrace.h"
 
 #include "ardour/playlist.h"
 #include "ardour/audioregion.h"
 #include "ardour/audiosource.h"
 #include "ardour/audio_diskstream.h"
+#include "ardour/session.h"
 
 #include "ardour_ui.h"
+#include "global_signals.h"
+#include "canvas-noevent-text.h"
 #include "streamview.h"
 #include "region_view.h"
 #include "automation_region_view.h"
@@ -43,6 +45,7 @@
 #include "region_editor.h"
 #include "ghostregion.h"
 #include "route_time_axis.h"
+#include "ui_config.h"
 #include "utils.h"
 #include "rgb_macros.h"
 #include "gui_thread.h"
 #include "i18n.h"
 
 using namespace std;
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
+using namespace Gtk;
 using namespace ArdourCanvas;
 
 static const int32_t sync_mark_width = 9;
 
-sigc::signal<void,RegionView*> RegionView::RegionViewGoingAway;
+PBD::Signal1<void,RegionView*> RegionView::RegionViewGoingAway;
 
-RegionView::RegionView (ArdourCanvas::Group*              parent, 
+RegionView::RegionView (ArdourCanvas::Group*              parent,
                         TimeAxisView&                     tv,
                         boost::shared_ptr<ARDOUR::Region> r,
                         double                            spu,
-                        Gdk::Color const &                basic_color)
-       : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), false,
+                        Gdk::Color const &                basic_color,
+                       bool                              automation)
+       : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), false, automation,
                            TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowNameText|
                                                          TimeAxisViewItem::ShowNameHighlight| TimeAxisViewItem::ShowFrame))
        , _region (r)
@@ -78,13 +82,16 @@ RegionView::RegionView (ArdourCanvas::Group*              parent,
        , _pixel_width(1.0)
        , in_destructor(false)
        , wait_for_data(false)
-       , _time_converter(r->session(), r->position())
+        , _silence_text (0)
+       , _time_converter(r->session().tempo_map(), r->position())
 {
+       GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context());
 }
 
 RegionView::RegionView (const RegionView& other)
        : sigc::trackable(other)
        , TimeAxisViewItem (other)
+        , _silence_text (0)
        , _time_converter(other._time_converter)
 {
        /* derived concrete type will call init () */
@@ -93,15 +100,17 @@ RegionView::RegionView (const RegionView& other)
        current_visible_sync_position = other.current_visible_sync_position;
        valid = false;
        _pixel_width = other._pixel_width;
-       _height = other._height;
+
+       GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context());
 }
 
 RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other_region)
        : sigc::trackable(other)
        , TimeAxisViewItem (other)
+        , _silence_text (0)
        , _time_converter(other._time_converter)
 {
-       /* this is a pseudo-copy constructor used when dragging regions 
+       /* this is a pseudo-copy constructor used when dragging regions
           around on the canvas.
        */
 
@@ -111,17 +120,18 @@ RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other
        current_visible_sync_position = other.current_visible_sync_position;
        valid = false;
        _pixel_width = other._pixel_width;
-       _height = other._height;
+
+       GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context());
 }
 
-RegionView::RegionView (ArdourCanvas::Group*         parent, 
+RegionView::RegionView (ArdourCanvas::Group*         parent,
                         TimeAxisView&                tv,
                         boost::shared_ptr<ARDOUR::Region> r,
                         double                       spu,
                         Gdk::Color const &           basic_color,
-                                               bool recording,
+                       bool                         recording,
                         TimeAxisViewItem::Visibility visibility)
-       : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), recording, visibility)
+       : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), recording, false, visibility)
        , _region (r)
        , sync_mark(0)
        , sync_line(0)
@@ -132,7 +142,8 @@ RegionView::RegionView (ArdourCanvas::Group*         parent,
        , _pixel_width(1.0)
        , in_destructor(false)
        , wait_for_data(false)
-       , _time_converter(r->session(), r->position())
+        , _silence_text (0)
+       , _time_converter(r->session().tempo_map(), r->position())
 {
 }
 
@@ -142,7 +153,6 @@ RegionView::init (Gdk::Color const & basic_color, bool wfd)
        editor        = 0;
        valid         = true;
        in_destructor = false;
-       _height       = 0;
        wait_for_data = wfd;
        sync_mark     = 0;
        sync_line     = 0;
@@ -153,34 +163,41 @@ RegionView::init (Gdk::Color const & basic_color, bool wfd)
 
        if (name_highlight) {
                name_highlight->set_data ("regionview", this);
-               name_highlight->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this));
-               
-               frame_handle_start->set_data ("regionview", this);
-               frame_handle_start->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_start, this));
+               name_highlight->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this));
 
-               frame_handle_end->set_data ("regionview", this);
-               frame_handle_end->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_end, this));
+               if (frame_handle_start) {
+                       frame_handle_start->set_data ("regionview", this);
+                       frame_handle_start->set_data ("isleft", (void*) 1);
+                       frame_handle_start->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_start, this));
+                       frame_handle_start->raise_to_top();
+               }
 
-               frame_handle_start->raise_to_top();
-               frame_handle_end->raise_to_top();
+               if (frame_handle_end) {
+                       frame_handle_end->set_data ("regionview", this);
+                       frame_handle_end->set_data ("isleft", (void*) 0);
+                       frame_handle_end->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_end, this));
+                       frame_handle_end->raise_to_top();
+               }
        }
 
        if (name_pixbuf) {
                name_pixbuf->set_data ("regionview", this);
+               name_pixbuf->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_event), name_pixbuf, this));
        }
 
-       if (wfd)
+       if (wfd) {
                _enable_display = true;
+       }
 
        set_height (trackview.current_height());
 
-       _region->StateChanged.connect (mem_fun(*this, &RegionView::region_changed));
-
-       group->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_event), group, this));
+       _region->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RegionView::region_changed, this, _1), gui_context());
+       
+       group->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_event), group, this));
 
        set_colors ();
 
-       ColorsChanged.connect (mem_fun (*this, &RegionView::color_handler));
+       ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler));
 
        /* XXX sync mark drag? */
 }
@@ -197,9 +214,159 @@ RegionView::~RegionView ()
                delete *i;
        }
 
+        drop_silent_frames ();
+
        delete editor;
 }
 
+void
+RegionView::set_silent_frames (const AudioIntervalResult& silences, double threshold)
+{
+        framecnt_t shortest = max_framecnt;
+        framecnt_t shortest_audible = max_framecnt;
+
+       /* remove old silent frames */
+        drop_silent_frames ();
+
+        if (silences.empty()) {
+                return;
+        }
+
+        framepos_t start;
+        framepos_t end;
+        bool in_silence;
+        bool seen_audible = false;
+        AudioIntervalResult::const_iterator s;
+        uint32_t const color = ARDOUR_UI::config()->canvasvar_Silence.get();
+
+        start = _region->start();
+        s = silences.begin();
+
+        if (s->first == start) {
+                /* segment starting at zero is silent */
+                end = s->second;
+                in_silence = true;
+        } else {
+                /* segment starting at zero is audible, and begins at the start of the region in the source */
+                end = s->first;
+                in_silence = false;
+        }
+
+        while (start < _region->start() + _region->length()) {
+
+                framecnt_t interval_duration = end - start;
+
+                if (interval_duration > 0) {
+                        if (in_silence) {
+                                
+                                ArdourCanvas::SimpleRect* cr = new ArdourCanvas::SimpleRect (*group);
+                                _silent_frames.push_back (cr);
+                                
+                                /* coordinates for the rect are relative to the regionview origin */
+                                
+                                cr->property_x1() = trackview.editor().frame_to_pixel (s->first - _region->start());
+                                cr->property_x2() = trackview.editor().frame_to_pixel (s->second - _region->start());
+                                cr->property_y1() = 1;
+                                cr->property_y2() = _height - 2;
+                                cr->property_outline_pixels() = 0;
+                                cr->property_fill_color_rgba () = color;
+                                
+                                if (interval_duration < shortest) {
+                                        shortest = interval_duration;
+                                }
+                                
+                        } else if (interval_duration > 0) {
+                                seen_audible = true;
+                                if (interval_duration < shortest_audible) {
+                                        shortest_audible = interval_duration;
+                                }
+                        }
+                        
+                        start = end;
+                        in_silence = !in_silence;
+                        ++s;
+                        
+                        if (s == silences.end()) {
+                                end = _region->start() + _region->length();
+                        } else {
+                                end = s->first;
+                        }
+                }
+        }
+
+
+        _silence_text = new ArdourCanvas::NoEventText (*group);
+        _silence_text->property_font_desc() = *(get_font_for_style (N_("SilenceText")));
+        _silence_text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SilenceText.get();                                                
+        _silence_text->property_anchor() = ANCHOR_NW;
+        
+        /* both positions are relative to the region start offset in source */
+        
+        _silence_text->property_x() = trackview.editor().frame_to_pixel (silences.front().first - _region->start()) + 10.0;
+        _silence_text->property_y() = 20.0;
+        
+        double ms = (float) shortest/_region->session().frame_rate();
+        
+        /* ms are now in seconds */
+
+        char const * sunits;
+        
+        if (ms >= 60.0) {
+                sunits = _("minutes");
+                ms /= 60.0;
+        } else if (ms < 1.0) {
+                sunits = _("msecs");
+                ms *= 1000.0;
+        } else {
+                sunits = _("secs");
+        }
+
+       string text = string_compose (ngettext ("%1 silent segment", "%1 silent segments", silences.size()), silences.size())
+               + ", "
+               + string_compose (_("shortest = %1 %2"), ms, sunits);
+
+        if (seen_audible) {
+                /* ms are now in seconds */
+                double ma = shortest_audible / _region->session().frame_rate();
+                char const * aunits;
+                
+                if (ma >= 60.0) {
+                        aunits = _("minutes");
+                        ma /= 60.0;
+                } else if (ma < 1.0) {
+                        aunits = _("msecs");
+                        ma *= 1000.0;
+                } else {
+                        aunits = _("secs");
+                }
+
+               text += string_compose (_("\n  (shortest audible segment = %1 %2)"), ma, aunits);
+       }
+
+       _silence_text->property_text() = text.c_str ();
+} 
+
+void
+RegionView::hide_silent_frames ()
+{
+       for (list<ArdourCanvas::SimpleRect*>::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) {
+                (*i)->hide ();
+       }
+        _silence_text->hide();
+}
+
+void
+RegionView::drop_silent_frames ()
+{
+       for (list<ArdourCanvas::SimpleRect*>::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) {
+               delete *i;
+       }
+        _silent_frames.clear ();
+
+        delete _silence_text;
+        _silence_text = 0;
+}
+
 gint
 RegionView::_lock_toggle (ArdourCanvas::Item*, GdkEvent* ev, void* arg)
 {
@@ -210,7 +377,7 @@ RegionView::_lock_toggle (ArdourCanvas::Item*, GdkEvent* ev, void* arg)
                break;
        default:
                break;
-       } 
+       }
        return FALSE;
 }
 
@@ -221,27 +388,27 @@ RegionView::lock_toggle ()
 }
 
 void
-RegionView::region_changed (Change what_changed)
+RegionView::region_changed (const PropertyChange& what_changed)
 {
-       ENSURE_GUI_THREAD (bind (mem_fun(*this, &RegionView::region_changed), what_changed));
+       ENSURE_GUI_THREAD (*this, &RegionView::region_changed, what_changed);
 
-       if (what_changed & BoundsChanged) {
+       if (what_changed.contains (ARDOUR::bounds_change)) {
                region_resized (what_changed);
                region_sync_changed ();
        }
-       if (what_changed & Region::MuteChanged) {
+       if (what_changed.contains (ARDOUR::Properties::muted)) {
                region_muted ();
        }
-       if (what_changed & Region::OpacityChanged) {
+       if (what_changed.contains (ARDOUR::Properties::opaque)) {
                region_opacity ();
        }
-       if (what_changed & ARDOUR::NameChanged) {
+       if (what_changed.contains (ARDOUR::Properties::name)) {
                region_renamed ();
        }
-       if (what_changed & Region::SyncOffsetChanged) {
+       if (what_changed.contains (ARDOUR::Properties::sync_position)) {
                region_sync_changed ();
        }
-       if (what_changed & Region::LockChanged) {
+       if (what_changed.contains (ARDOUR::Properties::locked)) {
                region_locked ();
        }
 }
@@ -254,21 +421,25 @@ RegionView::region_locked ()
 }
 
 void
-RegionView::region_resized (Change what_changed)
+RegionView::region_resized (const PropertyChange& what_changed)
 {
        double unit_length;
 
-       if (what_changed & ARDOUR::PositionChanged) {
+       if (what_changed.contains (ARDOUR::Properties::position)) {
                set_position (_region->position(), 0);
-               _time_converter.set_origin(_region->position());
+               _time_converter.set_origin_b (_region->position());
        }
 
-       if (what_changed & Change (StartChanged|LengthChanged)) {
+       PropertyChange s_and_l;
+       s_and_l.add (ARDOUR::Properties::start);
+       s_and_l.add (ARDOUR::Properties::length);
+
+       if (what_changed.contains (s_and_l)) {
 
                set_duration (_region->length(), 0);
 
                unit_length = _region->length() / samples_per_unit;
-               
+
                for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
 
                        (*i)->set_duration (unit_length);
@@ -310,7 +481,7 @@ RegionView::lower_to_bottom ()
 }
 
 bool
-RegionView::set_position (nframes_t pos, void* /*src*/, double* ignored)
+RegionView::set_position (framepos_t pos, void* /*src*/, double* ignored)
 {
        double delta;
        bool ret;
@@ -346,12 +517,12 @@ RegionView::set_samples_per_unit (gdouble spu)
 }
 
 bool
-RegionView::set_duration (nframes_t frames, void *src)
+RegionView::set_duration (framecnt_t frames, void *src)
 {
        if (!TimeAxisViewItem::set_duration (frames, src)) {
                return false;
        }
-       
+
        for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
                (*i)->set_duration (_region->length() / samples_per_unit);
        }
@@ -363,10 +534,10 @@ void
 RegionView::set_colors ()
 {
        TimeAxisViewItem::set_colors ();
-       
+
        if (sync_mark) {
-               sync_mark->property_fill_color_rgba() = fill_color;
-               sync_line->property_fill_color_rgba() = fill_color;
+               sync_mark->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255);     // fill_color;                   // FIXME make a themeable colour
+               sync_line->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255);     // fill_color;                   // FIXME make a themeable colour
        }
 }
 
@@ -390,10 +561,21 @@ RegionView::fake_set_opaque (bool yn)
        } else {
                fill_opacity = 60;
        }
-       
+
        set_frame_color ();
 }
 
+void
+RegionView::show_region_editor ()
+{
+       if (editor == 0) {
+               editor = new RegionEditor (trackview.session(), region());
+       }
+
+       editor->present ();
+       editor->show_all();
+}
+
 void
 RegionView::hide_region_editor()
 {
@@ -402,10 +584,10 @@ RegionView::hide_region_editor()
        }
 }
 
-Glib::ustring
+std::string
 RegionView::make_name () const
 {
-       Glib::ustring str;
+       std::string str;
 
        // XXX nice to have some good icons for this
 
@@ -431,7 +613,7 @@ RegionView::make_name () const
 void
 RegionView::region_renamed ()
 {
-       Glib::ustring str = make_name ();
+       std::string str = make_name ();
 
        set_item_name (str, this);
        set_name_text (str);
@@ -442,7 +624,7 @@ void
 RegionView::region_sync_changed ()
 {
        int sync_dir;
-       nframes_t sync_offset;
+       framecnt_t sync_offset;
 
        sync_offset = _region->sync_offset (sync_dir);
 
@@ -458,12 +640,12 @@ RegionView::region_sync_changed ()
        if (!sync_mark) {
 
                /* points set below */
-               
+
                sync_mark = new ArdourCanvas::Polygon (*group);
-               sync_mark->property_fill_color_rgba() = fill_color;
+               sync_mark->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255);     // fill_color;                   // FIXME make a themeable colour
 
                sync_line = new ArdourCanvas::Line (*group);
-               sync_line->property_fill_color_rgba() = fill_color;
+               sync_line->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255);     // fill_color;                   // FIXME make a themeable colour        
                sync_line->property_width_pixels() = 1;
        }
 
@@ -474,13 +656,13 @@ RegionView::region_sync_changed ()
        if (sync_offset == 0) {
 
                /* no sync mark - its the start of the region */
-               
+
                sync_mark->hide();
                sync_line->hide ();
 
        } else {
 
-               if ((sync_dir < 0) || ((sync_dir > 0) && (sync_offset > _region->length()))) { 
+               if ((sync_dir < 0) || ((sync_dir > 0) && (sync_offset > _region->length()))) {
 
                        /* no sync mark - its out of the bounds of the region */
 
@@ -492,14 +674,14 @@ RegionView::region_sync_changed ()
                        /* lets do it */
 
                        Points points;
-                       
+
                        //points = sync_mark->property_points().get_value();
-                       
+
                        double offset = sync_offset / samples_per_unit;
                        points.push_back (Gnome::Art::Point (offset - ((sync_mark_width-1)/2), 1));
                        points.push_back (Gnome::Art::Point (offset + ((sync_mark_width-1)/2), 1));
                        points.push_back (Gnome::Art::Point (offset, sync_mark_width - 1));
-                       points.push_back (Gnome::Art::Point (offset - ((sync_mark_width-1)/2), 1));     
+                       points.push_back (Gnome::Art::Point (offset - ((sync_mark_width-1)/2), 1));
                        sync_mark->property_points().set_value (points);
                        sync_mark->show ();
 
@@ -569,7 +751,7 @@ RegionView::set_height (double h)
        if (sync_line) {
                Points points;
                int sync_dir;
-               nframes_t sync_offset;
+               framecnt_t sync_offset;
                sync_offset = _region->sync_offset (sync_dir);
                double offset = sync_offset / samples_per_unit;
 
@@ -581,6 +763,11 @@ RegionView::set_height (double h)
        for (list<ArdourCanvas::SimpleRect*>::iterator i = _coverage_frames.begin(); i != _coverage_frames.end(); ++i) {
                (*i)->property_y2() = h + 1;
        }
+
+       for (list<ArdourCanvas::SimpleRect*>::iterator i = _silent_frames.begin(); i != _silent_frames.end(); ++i) {
+               (*i)->property_y2() = h + 1;
+       }
+
 }
 
 /** Remove old coverage frames and make new ones, if we're in a LayerDisplay mode
@@ -605,16 +792,16 @@ RegionView::update_coverage_frames (LayerDisplay d)
                return;
        }
 
-       nframes_t const position = _region->first_frame ();
-       nframes_t t = position;
-       nframes_t const end = _region->last_frame ();
+       framepos_t const position = _region->first_frame ();
+       framepos_t t = position;
+       framepos_t const end = _region->last_frame ();
 
        ArdourCanvas::SimpleRect* cr = 0;
        bool me = false;
 
        uint32_t const color = frame->property_fill_color_rgba ();
        uint32_t const base_alpha = UINT_RGBA_A (color);
-       
+
        while (t < end) {
 
                t++;
@@ -652,6 +839,132 @@ RegionView::update_coverage_frames (LayerDisplay d)
                cr->property_x2() = trackview.editor().frame_to_pixel (end - position);
        }
 
-       frame_handle_start->raise_to_top ();
-       frame_handle_end->raise_to_top ();
+       if (frame_handle_start) {
+               frame_handle_start->raise_to_top ();
+       }
+
+       if (frame_handle_end) {
+               frame_handle_end->raise_to_top ();
+       }
+
+       if (name_highlight) {
+               name_highlight->raise_to_top ();
+       }
+
+       if (name_pixbuf) {
+               name_pixbuf->raise_to_top ();
+       }
+}
+
+void
+RegionView::trim_front (framepos_t new_bound, bool no_overlap)
+{
+       if (_region->locked()) {
+               return;
+       }
+
+       RouteTimeAxisView& rtv = dynamic_cast<RouteTimeAxisView&> (trackview);
+       double const speed = rtv.track()->speed ();
+
+       framepos_t const pre_trim_first_frame = _region->first_frame();
+
+       _region->trim_front ((framepos_t) (new_bound * speed), this);
+
+       if (no_overlap) {
+               // Get the next region on the left of this region and shrink/expand it.
+               boost::shared_ptr<Playlist> playlist (_region->playlist());
+               boost::shared_ptr<Region> region_left = playlist->find_next_region (pre_trim_first_frame, End, 0);
+
+               bool regions_touching = false;
+
+               if (region_left != 0 && (pre_trim_first_frame == region_left->last_frame() + 1)) {
+                       regions_touching = true;
+               }
+
+               // Only trim region on the left if the first frame has gone beyond the left region's last frame.
+               if (region_left != 0 && (region_left->last_frame() > _region->first_frame() || regions_touching)) {
+                       region_left->trim_end (_region->first_frame() - 1, this);
+               }
+       }
+
+       region_changed (ARDOUR::bounds_change);
+}
+
+void
+RegionView::trim_end (framepos_t new_bound, bool no_overlap)
+{
+       if (_region->locked()) {
+               return;
+       }
+
+       RouteTimeAxisView& rtv = dynamic_cast<RouteTimeAxisView&> (trackview);
+       double const speed = rtv.track()->speed ();
+
+       framepos_t const pre_trim_last_frame = _region->last_frame();
+
+       _region->trim_end ((framepos_t) (new_bound * speed), this);
+
+       if (no_overlap) {
+               // Get the next region on the right of this region and shrink/expand it.
+               boost::shared_ptr<Playlist> playlist (_region->playlist());
+               boost::shared_ptr<Region> region_right = playlist->find_next_region (pre_trim_last_frame, Start, 1);
+
+               bool regions_touching = false;
+
+               if (region_right != 0 && (pre_trim_last_frame == region_right->first_frame() - 1)) {
+                       regions_touching = true;
+               }
+
+               // Only trim region on the right if the last frame has gone beyond the right region's first frame.
+               if (region_right != 0 && (region_right->first_frame() < _region->last_frame() || regions_touching)) {
+                       region_right->trim_front (_region->last_frame() + 1, this);
+               }
+
+               region_changed (ARDOUR::bounds_change);
+                       
+       } else {
+               region_changed (PropertyChange (ARDOUR::Properties::length));
+       }
+}
+
+
+void
+RegionView::thaw_after_trim ()
+{
+       if (_region->locked()) {
+               return;
+       }
+
+       _region->resume_property_changes ();
+}
+
+
+void
+RegionView::trim_contents (framepos_t frame_delta, bool left_direction, bool swap_direction)
+{
+       if (_region->locked()) {
+               return;
+       }
+
+       framepos_t new_bound;
+
+       RouteTimeAxisView& rtv = dynamic_cast<RouteTimeAxisView&> (trackview);
+       double const speed = rtv.track()->speed ();
+
+       if (left_direction) {
+               if (swap_direction) {
+                       new_bound = (framepos_t) (_region->position() / speed) + frame_delta;
+               } else {
+                       new_bound = (framepos_t) (_region->position() / speed) - frame_delta;
+               }
+       } else {
+               if (swap_direction) {
+                       new_bound = (framepos_t) (_region->position() / speed) - frame_delta;
+               } else {
+                       new_bound = (framepos_t) (_region->position() / speed) + frame_delta;
+               }
+       }
+
+       _region->trim_start ((framepos_t) (new_bound * speed), this);
+       region_changed (PropertyChange (ARDOUR::Properties::start));
 }