first part of MIDI cut/copy/paste ; fix for input/output_streams of an IOProcessor...
[ardour.git] / gtk2_ardour / editor_ops.cc
index 9c972d1fa75eb317f8b9d16c9428f3ff833d4305..0a7543b214a4ae6ce233a47bd7fbd5a06c253a07 100644 (file)
 
 */
 
+/* Note: public Editor methods are documented in public_editor.h */
+
 #include <unistd.h>
 
 #include <cstdlib>
 #include <cmath>
 #include <string>
 #include <map>
+#include <set>
 
-#include <pbd/error.h>
-#include <pbd/basename.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/memento_command.h>
+#include "pbd/error.h"
+#include "pbd/basename.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/memento_command.h"
+#include "pbd/whitespace.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/choice.h>
 #include <gtkmm2ext/window_title.h>
-
-#include <ardour/audioengine.h>
-#include <ardour/session.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audioregion.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/utils.h>
-#include <ardour/location.h>
-#include <ardour/named_selection.h>
-#include <ardour/audio_track.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/region_factory.h>
-#include <ardour/playlist_factory.h>
-#include <ardour/reverse.h>
+#include <gtkmm2ext/popup.h>
+
+#include "ardour/audioengine.h"
+#include "ardour/session.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/utils.h"
+#include "ardour/location.h"
+#include "ardour/named_selection.h"
+#include "ardour/audio_track.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/region_factory.h"
+#include "ardour/playlist_factory.h"
+#include "ardour/reverse.h"
+#include "ardour/transient_detector.h"
+#include "ardour/dB.h"
+#include "ardour/quantize.h"
+#include "ardour/strip_silence.h"
+#include "ardour/route_group.h"
 
 #include "ardour_ui.h"
 #include "editor.h"
 #include "time_axis_view.h"
+#include "route_time_axis.h"
 #include "audio_time_axis.h"
 #include "automation_time_axis.h"
 #include "streamview.h"
+#include "audio_streamview.h"
 #include "audio_region_view.h"
+#include "midi_region_view.h"
 #include "rgb_macros.h"
 #include "selection_templates.h"
 #include "selection.h"
 #include "editing.h"
 #include "gtk-custom-hruler.h"
 #include "gui_thread.h"
+#include "keyboard.h"
+#include "utils.h"
+#include "editor_drag.h"
+#include "strip_silence_dialog.h"
+#include "editor_routes.h"
+#include "editor_regions.h"
 
 #include "i18n.h"
 
@@ -91,124 +110,99 @@ Editor::redo (uint32_t n)
        }
 }
 
-int
-Editor::ensure_cursor (nframes_t *pos)
-{
-       *pos = edit_cursor->current_frame;
-       return 0;
-}
-
 void
 Editor::split_region ()
 {
-       split_region_at (edit_cursor->current_frame);
-}
+       RegionSelection rs;
 
-void
-Editor::split_region_at (nframes_t where)
-{
-       split_regions_at (where, selection->regions);
+       get_regions_for_action (rs, true);
+       split_regions_at (get_preferred_edit_position (), selection->regions);
 }
 
 void
-Editor::split_regions_at (nframes_t where, RegionSelection& regions)
+Editor::split_regions_at (nframes64_t where, RegionSelection& regions)
 {
+       list <boost::shared_ptr<Playlist > > used_playlists;
+
+       if (regions.empty()) {
+               return;
+       }
+
        begin_reversible_command (_("split"));
 
-       snap_to (where);
+       // if splitting a single region, and snap-to is using
+       // region boundaries, don't pay attention to them
+
+       if (regions.size() == 1) {
+               switch (snap_type) {
+               case SnapToRegionStart:
+               case SnapToRegionSync:
+               case SnapToRegionEnd:
+                       break;
+               default:
+                       snap_to (where);
+               }
+       } else {
+               snap_to (where);
+       }
+
        for (RegionSelection::iterator a = regions.begin(); a != regions.end(); ) {
 
                RegionSelection::iterator tmp;
+
+               /* XXX this test needs to be more complicated, to make sure we really
+                  have something to split.
+               */
                
+               if (!(*a)->region()->covers (where)) {
+                       ++a;
+                       continue;
+               }
+
                tmp = a;
                ++tmp;
 
                boost::shared_ptr<Playlist> pl = (*a)->region()->playlist();
 
+               if (! pl->frozen()) {
+                       /* we haven't seen this playlist before */
+
+                       /* remember used playlists so we can thaw them later */ 
+                       used_playlists.push_back(pl);
+                       pl->freeze();
+               }
+
                AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*a);
-               if (arv)
+               if (arv) {
                        _new_regionviews_show_envelope = arv->envelope_visible();
+               }
                
                if (pl) {
-                        XMLNode &before = pl->get_state();
+                       XMLNode &before = pl->get_state();
                        pl->split_region ((*a)->region(), where);
-                        XMLNode &after = pl->get_state();
-                        session->add_command(new MementoCommand<Playlist>(*pl, &before, &after));
+                       XMLNode &after = pl->get_state();
+                       session->add_command(new MementoCommand<Playlist>(*pl, &before, &after));
                }
 
                a = tmp;
-    }
-
-       commit_reversible_command ();
-       _new_regionviews_show_envelope = false;
-}
-
-void
-Editor::remove_clicked_region ()
-{
-       if (clicked_audio_trackview == 0 || clicked_regionview == 0) {
-               return;
-       }
-
-       boost::shared_ptr<Playlist> playlist = clicked_audio_trackview->playlist();
-       
-       begin_reversible_command (_("remove region"));
-        XMLNode &before = playlist->get_state();
-       playlist->remove_region (clicked_regionview->region());
-        XMLNode &after = playlist->get_state();
-       session->add_command(new MementoCommand<Playlist>(*playlist, &before, &after));
-       commit_reversible_command ();
-}
-
-void
-Editor::destroy_clicked_region ()
-{
-       uint32_t selected = selection->regions.size();
-
-       if (!session || !selected) {
-               return;
        }
 
-       vector<string> choices;
-       string prompt;
-       
-       prompt  = string_compose (_(" This is destructive, will possibly delete audio files\n\
-It cannot be undone\n\
-Do you really want to destroy %1 ?"),
-                          (selected > 1 ? 
-                           _("these regions") : _("this region")));
-
-       choices.push_back (_("No, do nothing."));
-
-       if (selected > 1) {
-               choices.push_back (_("Yes, destroy them."));
-       } else {
-               choices.push_back (_("Yes, destroy it."));
+       while (used_playlists.size() > 0) {
+               list <boost::shared_ptr<Playlist > >::iterator i = used_playlists.begin();
+               (*i)->thaw();
+               used_playlists.pop_front();
        }
-
-       Gtkmm2ext::Choice prompter (prompt, choices);
        
-       if (prompter.run() == 0) { /* first choice */
-               return;
-       }
-
-       if (selected) {
-               list<boost::shared_ptr<Region> > r;
-
-               for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
-                       r.push_back ((*i)->region());
-               }
-
-               session->destroy_regions (r);
-       } 
+       commit_reversible_command ();
+       _new_regionviews_show_envelope = false;
 }
 
 boost::shared_ptr<Region>
-Editor::select_region_for_operation (int dir, TimeAxisView **tv)
+Editor::select_region_for_operation (int /*dir*/, TimeAxisView **tv)
 {
        RegionView* rv;
        boost::shared_ptr<Region> region;
-       nframes_t start = 0;
+       nframes64_t start = 0;
 
        if (selection->time.start () == selection->time.end_frame ()) {
                
@@ -251,7 +245,7 @@ Editor::extend_selection_to_end_of_region (bool next)
 {
        TimeAxisView *tv;
        boost::shared_ptr<Region> region;
-       nframes_t start;
+       nframes64_t start;
 
        if ((region = select_region_for_operation (next ? 1 : 0, &tv)) == 0) {
                return;
@@ -279,7 +273,7 @@ Editor::extend_selection_to_start_of_region (bool previous)
 {
        TimeAxisView *tv;
        boost::shared_ptr<Region> region;
-       nframes_t end;
+       nframes64_t end;
 
        if ((region = select_region_for_operation (previous ? -1 : 0, &tv)) == 0) {
                return;
@@ -302,20 +296,45 @@ Editor::extend_selection_to_start_of_region (bool previous)
        commit_reversible_command ();
 }
 
+bool
+Editor::nudge_forward_release (GdkEventButton* ev)
+{
+       if (ev->state & Keyboard::PrimaryModifier) {
+               nudge_forward (false, true);
+       } else {
+               nudge_forward (false, false);
+       }
+       return false;
+}
+
+bool
+Editor::nudge_backward_release (GdkEventButton* ev)
+{
+       if (ev->state & Keyboard::PrimaryModifier) {
+               nudge_backward (false, true);
+       } else {
+               nudge_backward (false, false);
+       }
+       return false;
+}
+
 
 void
-Editor::nudge_forward (bool next)
+Editor::nudge_forward (bool next, bool force_playhead)
 {
-       nframes_t distance;
-       nframes_t next_distance;
+       nframes64_t distance;
+       nframes64_t next_distance;
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
 
        if (!session) return;
        
-       if (!selection->regions.empty()) {
+       if (!force_playhead && !rs.empty()) {
 
-               begin_reversible_command (_("nudge forward"));
+               begin_reversible_command (_("nudge regions forward"));
 
-               for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+               for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
                        boost::shared_ptr<Region> r ((*i)->region());
                        
                        distance = get_nudge_distance (r->position(), next_distance);
@@ -332,6 +351,49 @@ Editor::nudge_forward (bool next)
 
                commit_reversible_command ();
 
+               
+       } else if (!force_playhead && !selection->markers.empty()) {
+
+               bool is_start;
+
+               begin_reversible_command (_("nudge location forward"));
+               
+               for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) {
+                       
+                       Location* loc = find_location_from_marker ((*i), is_start);
+                       
+                       if (loc) {
+                               
+                               XMLNode& before (loc->get_state());
+                               
+                               if (is_start) {
+                                       distance = get_nudge_distance (loc->start(), next_distance);
+                                       if (next) {
+                                               distance = next_distance;
+                                       }
+                                       if (max_frames - distance > loc->start() + loc->length()) {
+                                               loc->set_start (loc->start() + distance);
+                                       } else {
+                                               loc->set_start (max_frames - loc->length());
+                                       }
+                               } else {
+                                       distance = get_nudge_distance (loc->end(), next_distance);
+                                       if (next) {
+                                               distance = next_distance;
+                                       }
+                                       if (max_frames - distance > loc->end()) {
+                                               loc->set_end (loc->end() + distance);
+                                       } else {
+                                               loc->set_end (max_frames);
+                                       }
+                               }
+                               XMLNode& after (loc->get_state());
+                               session->add_command (new MementoCommand<Location>(*loc, &before, &after));
+                       }
+               }
+               
+               commit_reversible_command ();
+               
        } else {
                distance = get_nudge_distance (playhead_cursor->current_frame, next_distance);
                session->request_locate (playhead_cursor->current_frame + distance);
@@ -339,18 +401,21 @@ Editor::nudge_forward (bool next)
 }
                
 void
-Editor::nudge_backward (bool next)
+Editor::nudge_backward (bool next, bool force_playhead)
 {
-       nframes_t distance;
-       nframes_t next_distance;
+       nframes64_t distance;
+       nframes64_t next_distance;
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
 
        if (!session) return;
        
-       if (!selection->regions.empty()) {
+       if (!force_playhead && !rs.empty()) {
 
-               begin_reversible_command (_("nudge forward"));
+               begin_reversible_command (_("nudge regions backward"));
 
-               for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+               for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
                        boost::shared_ptr<Region> r ((*i)->region());
 
                        distance = get_nudge_distance (r->position(), next_distance);
@@ -372,6 +437,51 @@ Editor::nudge_backward (bool next)
 
                commit_reversible_command ();
 
+       } else if (!force_playhead && !selection->markers.empty()) {
+
+               bool is_start;
+
+               begin_reversible_command (_("nudge location forward"));
+
+               for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) {
+
+                       Location* loc = find_location_from_marker ((*i), is_start);
+                       
+                       if (loc) {
+                               
+                               XMLNode& before (loc->get_state());
+                       
+                               if (is_start) {
+                                       distance = get_nudge_distance (loc->start(), next_distance);
+                                       if (next) {
+                                               distance = next_distance;
+                                       }
+                                       if (distance < loc->start()) {
+                                               loc->set_start (loc->start() - distance);
+                                       } else {
+                                               loc->set_start (0);
+                                       }
+                               } else {
+                                       distance = get_nudge_distance (loc->end(), next_distance);
+                                       
+                                       if (next) {
+                                               distance = next_distance;
+                                       }
+                                       
+                                       if (distance < loc->end() - loc->length()) {
+                                               loc->set_end (loc->end() - distance);
+                                       } else {
+                                               loc->set_end (loc->length());
+                                       }
+                               }
+                               
+                               XMLNode& after (loc->get_state());
+                               session->add_command (new MementoCommand<Location>(*loc, &before, &after));
+                       }
+               }
+
+               commit_reversible_command ();
+                       
        } else {
 
                distance = get_nudge_distance (playhead_cursor->current_frame, next_distance);
@@ -387,17 +497,20 @@ Editor::nudge_backward (bool next)
 void
 Editor::nudge_forward_capture_offset ()
 {
-       nframes_t distance;
+       nframes64_t distance;
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
 
        if (!session) return;
        
-       if (!selection->regions.empty()) {
+       if (!rs.empty()) {
 
                begin_reversible_command (_("nudge forward"));
 
                distance = session->worst_output_latency();
 
-               for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+               for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
                        boost::shared_ptr<Region> r ((*i)->region());
                        
                        XMLNode &before = r->playlist()->get_state();
@@ -414,17 +527,20 @@ Editor::nudge_forward_capture_offset ()
 void
 Editor::nudge_backward_capture_offset ()
 {
-       nframes_t distance;
+       nframes64_t distance;
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
 
        if (!session) return;
        
-       if (!selection->regions.empty()) {
+       if (!rs.empty()) {
 
                begin_reversible_command (_("nudge forward"));
 
                distance = session->worst_output_latency();
 
-               for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+               for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
                        boost::shared_ptr<Region> r ((*i)->region());
 
                         XMLNode &before = r->playlist()->get_state();
@@ -460,7 +576,7 @@ Editor::move_to_end ()
 void
 Editor::build_region_boundary_cache ()
 {
-       nframes_t pos = 0;
+       nframes64_t pos = 0;
        vector<RegionPoint> interesting_points;
        boost::shared_ptr<Region> r;
        TrackViewList tracks;
@@ -503,38 +619,43 @@ Editor::build_region_boundary_cache ()
 
        while (pos < session->current_end_frame() && !at_end) {
 
-               nframes_t rpos;
-               nframes_t lpos = max_frames;
+               nframes64_t rpos;
+               nframes64_t lpos = max_frames;
 
                for (vector<RegionPoint>::iterator p = interesting_points.begin(); p != interesting_points.end(); ++p) {
 
                        if ((r = find_next_region (pos, *p, 1, tlist, &ontrack)) == 0) {
-                               at_end = true;
+                               if (*p == interesting_points.back()) {
+                                       at_end = true;
+                               }
                                /* move to next point type */
                                continue;
                        }
 
-                       
                        switch (*p) {
                        case Start:
                                rpos = r->first_frame();
                                break;
+
                        case End:
                                rpos = r->last_frame();
                                break;  
+
                        case SyncPoint:
-                               rpos = r->adjust_to_sync (r->first_frame());
+                               rpos = r->sync_position ();
+                               //r->adjust_to_sync (r->first_frame());
                                break;
+
                        default:
                                break;
                        }
                        
                        float speed = 1.0f;
-                       AudioTimeAxisView *atav;
+                       RouteTimeAxisView *rtav;
                        
-                       if (ontrack != 0 && (atav = dynamic_cast<AudioTimeAxisView*>(ontrack)) != 0 ) {
-                               if (atav->get_diskstream() != 0) {
-                                       speed = atav->get_diskstream()->speed();
+                       if (ontrack != 0 && (rtav = dynamic_cast<RouteTimeAxisView*>(ontrack)) != 0 ) {
+                               if (rtav->get_diskstream() != 0) {
+                                       speed = rtav->get_diskstream()->speed();
                                }
                        }
                        
@@ -548,7 +669,7 @@ Editor::build_region_boundary_cache ()
                           to sort later.
                        */
 
-                       vector<nframes_t>::iterator ri; 
+                       vector<nframes64_t>::iterator ri; 
                        
                        for (ri = region_boundary_cache.begin(); ri != region_boundary_cache.end(); ++ri) {
                                if (*ri == rpos) {
@@ -570,26 +691,26 @@ Editor::build_region_boundary_cache ()
 }
 
 boost::shared_ptr<Region>
-Editor::find_next_region (nframes_t frame, RegionPoint point, int32_t dir, TrackViewList& tracks, TimeAxisView **ontrack)
+Editor::find_next_region (nframes64_t frame, RegionPoint point, int32_t dir, TrackViewList& tracks, TimeAxisView **ontrack)
 {
        TrackViewList::iterator i;
-       nframes_t closest = max_frames;
+       nframes64_t closest = max_frames;
        boost::shared_ptr<Region> ret;
-       nframes_t rpos = 0;
+       nframes64_t rpos = 0;
 
        float track_speed;
-       nframes_t track_frame;
-       AudioTimeAxisView *atav;
+       nframes64_t track_frame;
+       RouteTimeAxisView *rtav;
 
        for (i = tracks.begin(); i != tracks.end(); ++i) {
 
-               nframes_t distance;
+               nframes64_t distance;
                boost::shared_ptr<Region> r;
                
                track_speed = 1.0f;
-               if ( (atav = dynamic_cast<AudioTimeAxisView*>(*i)) != 0 ) {
-                       if (atav->get_diskstream()!=0)
-                               track_speed = atav->get_diskstream()->speed();
+               if ( (rtav = dynamic_cast<RouteTimeAxisView*>(*i)) != 0 ) {
+                       if (rtav->get_diskstream()!=0)
+                               track_speed = rtav->get_diskstream()->speed();
                }
 
                track_frame = session_frame_to_track_frame(frame, track_speed);
@@ -608,9 +729,11 @@ Editor::find_next_region (nframes_t frame, RegionPoint point, int32_t dir, Track
                        break;
 
                case SyncPoint:
-                       rpos = r->adjust_to_sync (r->first_frame());
+                       rpos = r->sync_position ();
+                       // r->adjust_to_sync (r->first_frame());
                        break;
                }
+
                // rpos is a "track frame", converting it to "session frame"
                rpos = track_frame_to_session_frame(rpos, track_speed);
 
@@ -631,11 +754,113 @@ Editor::find_next_region (nframes_t frame, RegionPoint point, int32_t dir, Track
        return ret;
 }
 
+nframes64_t
+Editor::find_next_region_boundary (nframes64_t pos, int32_t dir, const TrackViewList& tracks)
+{
+       nframes64_t distance = max_frames;
+       nframes64_t current_nearest = -1;
+
+
+       for (TrackViewList::const_iterator i = tracks.begin(); i != tracks.end(); ++i) {
+               nframes64_t contender;
+               nframes64_t d;
+
+               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
+
+               if (!rtv) {
+                       continue;
+               }
+
+               if ((contender = rtv->find_next_region_boundary (pos, dir)) < 0) {
+                       continue;
+               }
+
+               d = ::llabs (pos - contender);
+
+               if (d < distance) {
+                       current_nearest = contender;
+                       distance = d;
+               }
+       }
+       
+       return current_nearest;
+}
+
+nframes64_t
+Editor::get_region_boundary (nframes64_t pos, int32_t dir, bool with_selection, bool only_onscreen)
+{
+       nframes64_t target;
+       TrackViewList tvl;
+
+       if (with_selection && Config->get_region_boundaries_from_selected_tracks()) {
+
+               if (!selection->tracks.empty()) {
+                       
+                       target = find_next_region_boundary (pos, dir, selection->tracks);
+                       
+               } else {
+                       
+                       if (only_onscreen || Config->get_region_boundaries_from_onscreen_tracks()) {
+                               get_onscreen_tracks (tvl);
+                               target = find_next_region_boundary (pos, dir, tvl);
+                       } else {
+                               target = find_next_region_boundary (pos, dir, track_views);
+                       }
+               }
+               
+       } else {
+
+               if (only_onscreen || Config->get_region_boundaries_from_onscreen_tracks()) {
+                       get_onscreen_tracks (tvl);
+                       target = find_next_region_boundary (pos, dir, tvl);
+               } else {
+                       target = find_next_region_boundary (pos, dir, track_views);
+               }
+       }
+       
+       return target;
+}
+
+void
+Editor::cursor_to_region_boundary (bool with_selection, int32_t dir)
+{
+       nframes64_t pos = playhead_cursor->current_frame;
+       nframes64_t target;
+
+       if (!session) {
+               return;
+       }
+
+       // so we don't find the current region again..
+       if (dir > 0 || pos > 0) {
+               pos += dir;
+       }
+
+       if ((target = get_region_boundary (pos, dir, with_selection, false)) < 0) {
+               return;
+       }
+
+
+       session->request_locate (target);
+}
+
+void
+Editor::cursor_to_next_region_boundary (bool with_selection)
+{
+       cursor_to_region_boundary (with_selection, 1);
+}
+
+void
+Editor::cursor_to_previous_region_boundary (bool with_selection)
+{
+       cursor_to_region_boundary (with_selection, -1);
+}
+
 void
-Editor::cursor_to_region_point (Cursor* cursor, RegionPoint point, int32_t dir)
+Editor::cursor_to_region_point (EditorCursor* cursor, RegionPoint point, int32_t dir)
 {
        boost::shared_ptr<Region> r;
-       nframes_t pos = cursor->current_frame;
+       nframes64_t pos = cursor->current_frame;
 
        if (!session) {
                return;
@@ -651,10 +876,10 @@ Editor::cursor_to_region_point (Cursor* cursor, RegionPoint point, int32_t dir)
                
                r = find_next_region (pos, point, dir, selection->tracks, &ontrack);
                
-       } else if (clicked_trackview) {
+       } else if (clicked_axisview) {
                
                TrackViewList t;
-               t.push_back (clicked_trackview);
+               t.push_back (clicked_axisview);
                
                r = find_next_region (pos, point, dir, t, &ontrack);
                
@@ -677,16 +902,17 @@ Editor::cursor_to_region_point (Cursor* cursor, RegionPoint point, int32_t dir)
                break;
 
        case SyncPoint:
-               pos = r->adjust_to_sync (r->first_frame());
+               pos = r->sync_position ();
+               // r->adjust_to_sync (r->first_frame());
                break;  
        }
        
        float speed = 1.0f;
-       AudioTimeAxisView *atav;
+       RouteTimeAxisView *rtav;
 
-       if ( ontrack != 0 && (atav = dynamic_cast<AudioTimeAxisView*>(ontrack)) != 0 ) {
-               if (atav->get_diskstream() != 0) {
-                       speed = atav->get_diskstream()->speed();
+       if ( ontrack != 0 && (rtav = dynamic_cast<RouteTimeAxisView*>(ontrack)) != 0 ) {
+               if (rtav->get_diskstream() != 0) {
+                       speed = rtav->get_diskstream()->speed();
                }
        }
 
@@ -700,25 +926,29 @@ Editor::cursor_to_region_point (Cursor* cursor, RegionPoint point, int32_t dir)
 }
 
 void
-Editor::cursor_to_next_region_point (Cursor* cursor, RegionPoint point)
+Editor::cursor_to_next_region_point (EditorCursor* cursor, RegionPoint point)
 {
        cursor_to_region_point (cursor, point, 1);
 }
 
 void
-Editor::cursor_to_previous_region_point (Cursor* cursor, RegionPoint point)
+Editor::cursor_to_previous_region_point (EditorCursor* cursor, RegionPoint point)
 {
        cursor_to_region_point (cursor, point, -1);
 }
 
 void
-Editor::cursor_to_selection_start (Cursor *cursor)
+Editor::cursor_to_selection_start (EditorCursor *cursor)
 {
-       nframes_t pos = 0;
+       nframes64_t pos = 0;
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
        switch (mouse_mode) {
        case MouseObject:
-               if (!selection->regions.empty()) {
-                       pos = selection->regions.start();
+               if (!rs.empty()) {
+                       pos = rs.start();
                }
                break;
 
@@ -740,14 +970,17 @@ Editor::cursor_to_selection_start (Cursor *cursor)
 }
 
 void
-Editor::cursor_to_selection_end (Cursor *cursor)
+Editor::cursor_to_selection_end (EditorCursor *cursor)
 {
-       nframes_t pos = 0;
+       nframes64_t pos = 0;
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
 
        switch (mouse_mode) {
        case MouseObject:
-               if (!selection->regions.empty()) {
-                       pos = selection->regions.end_frame();
+               if (!rs.empty()) {
+                       pos = rs.end_frame();
                }
                break;
 
@@ -769,77 +1002,284 @@ Editor::cursor_to_selection_end (Cursor *cursor)
 }
 
 void
-Editor::scroll_playhead (bool forward)
+Editor::selected_marker_to_region_boundary (bool with_selection, int32_t dir)
 {
-       nframes_t pos = playhead_cursor->current_frame;
-       nframes_t delta = (nframes_t) floor (current_page_frames() / 0.8);
-
-       if (forward) {
-               if (pos == max_frames) {
-                       return;
-               }
+       nframes64_t target;
+       Location* loc;
+       bool ignored;
 
-               if (pos < max_frames - delta) {
-                       pos += delta ;
-               } else {
-                       pos = max_frames;
-               } 
+       if (!session) {
+               return;
+       }
 
-       } else {
+       if (selection->markers.empty()) {
+               nframes64_t mouse;
+               bool ignored;
 
-               if (pos == 0) {
+               if (!mouse_frame (mouse, ignored)) {
                        return;
-               } 
-
-               if (pos > delta) {
-                       pos -= delta;
-               } else {
-                       pos = 0;
                }
+               
+               add_location_mark (mouse);
        }
 
-       session->request_locate (pos);
-}
+       if ((loc = find_location_from_marker (selection->markers.front(), ignored)) == 0) {
+               return;
+       }
 
-void
-Editor::playhead_backward ()
-{
-       nframes_t pos;
-       nframes_t cnt;
-       float prefix;
-       bool was_floating;
+       nframes64_t pos = loc->start();
 
-       if (get_prefix (prefix, was_floating)) {
-               cnt = 1;
-       } else {
-               if (was_floating) {
-                       cnt = (nframes_t) floor (prefix * session->frame_rate ());
-               } else {
-                       cnt = (nframes_t) prefix;
-               }
+       // so we don't find the current region again..
+       if (dir > 0 || pos > 0) {
+               pos += dir;
        }
 
-       pos = playhead_cursor->current_frame;
-
-       if ((nframes_t) pos < cnt) {
-               pos = 0;
-       } else {
-               pos -= cnt;
+       if ((target = get_region_boundary (pos, dir, with_selection, false)) < 0) {
+               return;
        }
-       
-       /* XXX this is completely insane. with the current buffering
-          design, we'll force a complete track buffer flush and
-          reload, just to move 1 sample !!!
-       */
 
-       session->request_locate (pos);
+       loc->move_to (target);
+}
+
+void
+Editor::selected_marker_to_next_region_boundary (bool with_selection)
+{
+       selected_marker_to_region_boundary (with_selection, 1);
+}
+
+void
+Editor::selected_marker_to_previous_region_boundary (bool with_selection)
+{
+       selected_marker_to_region_boundary (with_selection, -1);
+}
+
+void
+Editor::selected_marker_to_region_point (RegionPoint point, int32_t dir)
+{
+       boost::shared_ptr<Region> r;
+       nframes64_t pos;
+       Location* loc;
+       bool ignored;
+
+       if (!session || selection->markers.empty()) {
+               return;
+       }
+
+       if ((loc = find_location_from_marker (selection->markers.front(), ignored)) == 0) {
+               return;
+       }
+
+       TimeAxisView *ontrack = 0;
+
+       pos = loc->start();
+
+       // so we don't find the current region again..
+       if (dir>0 || pos>0)
+               pos+=dir;
+
+       if (!selection->tracks.empty()) {
+               
+               r = find_next_region (pos, point, dir, selection->tracks, &ontrack);
+               
+       } else {
+               
+               r = find_next_region (pos, point, dir, track_views, &ontrack);
+       }
+
+       if (r == 0) {
+               return;
+       }
+       
+       switch (point){
+       case Start:
+               pos = r->first_frame ();
+               break;
+
+       case End:
+               pos = r->last_frame ();
+               break;
+
+       case SyncPoint:
+               pos = r->adjust_to_sync (r->first_frame());
+               break;  
+       }
+       
+       float speed = 1.0f;
+       RouteTimeAxisView *rtav;
+
+       if (ontrack != 0 && (rtav = dynamic_cast<RouteTimeAxisView*>(ontrack)) != 0) {
+               if (rtav->get_diskstream() != 0) {
+                       speed = rtav->get_diskstream()->speed();
+               }
+       }
+
+       pos = track_frame_to_session_frame(pos, speed);
+
+       loc->move_to (pos);
+}
+
+void
+Editor::selected_marker_to_next_region_point (RegionPoint point)
+{
+       selected_marker_to_region_point (point, 1);
+}
+
+void
+Editor::selected_marker_to_previous_region_point (RegionPoint point)
+{
+       selected_marker_to_region_point (point, -1);
+}
+
+void
+Editor::selected_marker_to_selection_start ()
+{
+       nframes64_t pos = 0;
+       Location* loc;
+       bool ignored;
+
+       if (!session || selection->markers.empty()) {
+               return;
+       }
+
+       if ((loc = find_location_from_marker (selection->markers.front(), ignored)) == 0) {
+               return;
+       }
+
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       switch (mouse_mode) {
+       case MouseObject:
+               if (!rs.empty()) {
+                       pos = rs.start();
+               }
+               break;
+
+       case MouseRange:
+               if (!selection->time.empty()) {
+                       pos = selection->time.start ();
+               }
+               break;
+
+       default:
+               return;
+       }
+
+       loc->move_to (pos);
+}
+
+void
+Editor::selected_marker_to_selection_end ()
+{
+       nframes64_t pos = 0;
+       Location* loc;
+       bool ignored;
+
+       if (!session || selection->markers.empty()) {
+               return;
+       }
+
+       if ((loc = find_location_from_marker (selection->markers.front(), ignored)) == 0) {
+               return;
+       }
+
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       switch (mouse_mode) {
+       case MouseObject:
+               if (!rs.empty()) {
+                       pos = rs.end_frame();
+               }
+               break;
+
+       case MouseRange:
+               if (!selection->time.empty()) {
+                       pos = selection->time.end_frame ();
+               }
+               break;
+
+       default:
+               return;
+       }
+
+       loc->move_to (pos);
+}
+
+void
+Editor::scroll_playhead (bool forward)
+{
+       nframes64_t pos = playhead_cursor->current_frame;
+       nframes64_t delta = (nframes64_t) floor (current_page_frames() / 0.8);
+
+       if (forward) {
+               if (pos == max_frames) {
+                       return;
+               }
+
+               if (pos < max_frames - delta) {
+                       pos += delta ;
+               } else {
+                       pos = max_frames;
+               } 
+
+       } else {
+
+               if (pos == 0) {
+                       return;
+               } 
+
+               if (pos > delta) {
+                       pos -= delta;
+               } else {
+                       pos = 0;
+               }
+       }
+
+       session->request_locate (pos);
+}
+
+void
+Editor::playhead_backward ()
+{
+       nframes64_t pos;
+       nframes64_t cnt;
+       float prefix;
+       bool was_floating;
+
+       if (get_prefix (prefix, was_floating)) {
+               cnt = 1;
+       } else {
+               if (was_floating) {
+                       cnt = (nframes64_t) floor (prefix * session->frame_rate ());
+               } else {
+                       cnt = (nframes64_t) prefix;
+               }
+       }
+
+       pos = playhead_cursor->current_frame;
+
+       if ((nframes64_t) pos < cnt) {
+               pos = 0;
+       } else {
+               pos -= cnt;
+       }
+       
+       /* XXX this is completely insane. with the current buffering
+          design, we'll force a complete track buffer flush and
+          reload, just to move 1 sample !!!
+       */
+
+       session->request_locate (pos);
 }
 
 void
 Editor::playhead_forward ()
 {
-       nframes_t pos;
-       nframes_t cnt;
+       nframes64_t pos;
+       nframes64_t cnt;
        bool was_floating;
        float prefix;
 
@@ -847,9 +1287,9 @@ Editor::playhead_forward ()
                cnt = 1;
        } else {
                if (was_floating) {
-                       cnt = (nframes_t) floor (prefix * session->frame_rate ());
+                       cnt = (nframes64_t) floor (prefix * session->frame_rate ());
                } else {
-                       cnt = (nframes_t) floor (prefix);
+                       cnt = (nframes64_t) floor (prefix);
                }
        }
 
@@ -866,20 +1306,41 @@ Editor::playhead_forward ()
 void
 Editor::cursor_align (bool playhead_to_edit)
 {
+       if (!session) {
+               return;
+       }
+
        if (playhead_to_edit) {
-               if (session) {
-                       session->request_locate (edit_cursor->current_frame);
+
+               if (selection->markers.empty()) {
+                       return;
                }
+               
+               session->request_locate (selection->markers.front()->position(), session->transport_rolling());
+       
        } else {
-               edit_cursor->set_position (playhead_cursor->current_frame);
+               /* move selected markers to playhead */
+               
+               for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) {
+                       bool ignored;
+                       
+                       Location* loc = find_location_from_marker (*i, ignored);
+                       
+                       if (loc->is_mark()) {
+                               loc->set_start (playhead_cursor->current_frame);
+                       } else {
+                               loc->set (playhead_cursor->current_frame,
+                                         playhead_cursor->current_frame + loc->length());
+                       }
+               }
        }
 }
 
 void
 Editor::edit_cursor_backward ()
 {
-       nframes_t pos;
-       nframes_t cnt;
+       nframes64_t pos;
+       nframes64_t cnt;
        float prefix;
        bool was_floating;
 
@@ -887,28 +1348,30 @@ Editor::edit_cursor_backward ()
                cnt = 1;
        } else {
                if (was_floating) {
-                       cnt = (nframes_t) floor (prefix * session->frame_rate ());
+                       cnt = (nframes64_t) floor (prefix * session->frame_rate ());
                } else {
-                       cnt = (nframes_t) prefix;
+                       cnt = (nframes64_t) prefix;
                }
        }
 
-       pos = edit_cursor->current_frame;
+       if ((pos = get_preferred_edit_position()) < 0) {
+               return;
+       }
 
-       if ((nframes_t) pos < cnt) {
+       if (pos < cnt) {
                pos = 0;
        } else {
                pos -= cnt;
        }
        
-       edit_cursor->set_position (pos);
+       // EDIT CURSOR edit_cursor->set_position (pos);
 }
 
 void
 Editor::edit_cursor_forward ()
 {
-       nframes_t pos;
-       nframes_t cnt;
+       //nframes64_t pos;
+       nframes64_t cnt;
        bool was_floating;
        float prefix;
 
@@ -916,14 +1379,14 @@ Editor::edit_cursor_forward ()
                cnt = 1;
        } else {
                if (was_floating) {
-                       cnt = (nframes_t) floor (prefix * session->frame_rate ());
+                       cnt = (nframes64_t) floor (prefix * session->frame_rate ());
                } else {
-                       cnt = (nframes_t) floor (prefix);
+                       cnt = (nframes64_t) floor (prefix);
                }
        }
 
-       pos = edit_cursor->current_frame;
-       edit_cursor->set_position (pos+cnt);
+       // pos = edit_cursor->current_frame;
+       // EDIT CURSOR edit_cursor->set_position (pos+cnt);
 }
 
 void
@@ -931,16 +1394,16 @@ Editor::goto_frame ()
 {
        float prefix;
        bool was_floating;
-       nframes_t frame;
+       nframes64_t frame;
 
        if (get_prefix (prefix, was_floating)) {
                return;
        }
 
        if (was_floating) {
-               frame = (nframes_t) floor (prefix * session->frame_rate());
+               frame = (nframes64_t) floor (prefix * session->frame_rate());
        } else {
-               frame = (nframes_t) floor (prefix);
+               frame = (nframes64_t) floor (prefix);
        }
 
        session->request_locate (frame);
@@ -949,19 +1412,19 @@ Editor::goto_frame ()
 void
 Editor::scroll_backward (float pages)
 {
-       nframes_t frame;
-       nframes_t one_page = (nframes_t) rint (canvas_width * frames_per_unit);
+       nframes64_t frame;
+       nframes64_t one_page = (nframes64_t) rint (_canvas_width * frames_per_unit);
        bool was_floating;
        float prefix;
-       nframes_t cnt;
+       nframes64_t cnt;
        
        if (get_prefix (prefix, was_floating)) {
-               cnt = (nframes_t) floor (pages * one_page);
+               cnt = (nframes64_t) floor (pages * one_page);
        } else {
                if (was_floating) {
-                       cnt = (nframes_t) floor (prefix * session->frame_rate());
+                       cnt = (nframes64_t) floor (prefix * session->frame_rate());
                } else {
-                       cnt = (nframes_t) floor (prefix * one_page);
+                       cnt = (nframes64_t) floor (prefix * one_page);
                }
        }
 
@@ -977,19 +1440,19 @@ Editor::scroll_backward (float pages)
 void
 Editor::scroll_forward (float pages)
 {
-       nframes_t frame;
-       nframes_t one_page = (nframes_t) rint (canvas_width * frames_per_unit);
+       nframes64_t frame;
+       nframes64_t one_page = (nframes64_t) rint (_canvas_width * frames_per_unit);
        bool was_floating;
        float prefix;
-       nframes_t cnt;
+       nframes64_t cnt;
        
        if (get_prefix (prefix, was_floating)) {
-               cnt = (nframes_t) floor (pages * one_page);
+               cnt = (nframes64_t) floor (pages * one_page);
        } else {
                if (was_floating) {
-                       cnt = (nframes_t) floor (prefix * session->frame_rate());
+                       cnt = (nframes64_t) floor (prefix * session->frame_rate());
                } else {
-                       cnt = (nframes_t) floor (prefix * one_page);
+                       cnt = (nframes64_t) floor (prefix * one_page);
                }
        }
 
@@ -1017,8 +1480,8 @@ Editor::scroll_tracks_down ()
 
        double vert_value = vertical_adjustment.get_value() + (cnt *
                vertical_adjustment.get_page_size());
-       if (vert_value > vertical_adjustment.get_upper() - canvas_height) {
-               vert_value = vertical_adjustment.get_upper() - canvas_height;
+       if (vert_value > vertical_adjustment.get_upper() - _canvas_height) {
+               vert_value = vertical_adjustment.get_upper() - _canvas_height;
        }
        vertical_adjustment.set_value (vert_value);
 }
@@ -1044,10 +1507,10 @@ Editor::scroll_tracks_down_line ()
 {
 
         Gtk::Adjustment* adj = edit_vscrollbar.get_adjustment();
-       double vert_value = adj->get_value() + 20;
+       double vert_value = adj->get_value() + 60;
 
-       if (vert_value>adj->get_upper() - canvas_height) {
-               vert_value = adj->get_upper() - canvas_height;
+       if (vert_value>adj->get_upper() - _canvas_height) {
+               vert_value = adj->get_upper() - _canvas_height;
        }
        adj->set_value (vert_value);
 }
@@ -1056,7 +1519,7 @@ void
 Editor::scroll_tracks_up_line ()
 {
         Gtk::Adjustment* adj = edit_vscrollbar.get_adjustment();
-       adj->set_value (adj->get_value() - 20);
+       adj->set_value (adj->get_value() - 60);
 }
 
 /* ZOOM */
@@ -1084,17 +1547,28 @@ Editor::temporal_zoom (gdouble fpu)
 {
        if (!session) return;
        
-       nframes_t current_page = current_page_frames();
-       nframes_t current_leftmost = leftmost_frame;
-       nframes_t current_rightmost;
-       nframes_t current_center;
-       nframes_t new_page;
-       nframes_t leftmost_after_zoom = 0;
+       nframes64_t current_page = current_page_frames();
+       nframes64_t current_leftmost = leftmost_frame;
+       nframes64_t current_rightmost;
+       nframes64_t current_center;
+       nframes64_t new_page_size;
+       nframes64_t half_page_size;
+       nframes64_t leftmost_after_zoom = 0;
+       nframes64_t where;
+       bool in_track_canvas;
        double nfpu;
+       double l;
+
+       /* XXX this limit is also in ::set_frames_per_unit() */
+
+       if (frames_per_unit <= 2.0 && fpu <= frames_per_unit) {
+               return;
+       }
 
        nfpu = fpu;
        
-       new_page = (nframes_t) floor (canvas_width * nfpu);
+       new_page_size = (nframes64_t) floor (_canvas_width * nfpu);
+       half_page_size = new_page_size / 2;
 
        switch (zoom_focus) {
        case ZoomFocusLeft:
@@ -1103,37 +1577,85 @@ Editor::temporal_zoom (gdouble fpu)
                
        case ZoomFocusRight:
                current_rightmost = leftmost_frame + current_page;
-               if (current_rightmost > new_page) {
-                       leftmost_after_zoom = current_rightmost - new_page;
-               } else {
+               if (current_rightmost < new_page_size) {
                        leftmost_after_zoom = 0;
+               } else {
+                       leftmost_after_zoom = current_rightmost - new_page_size;
                }
                break;
                
        case ZoomFocusCenter:
                current_center = current_leftmost + (current_page/2); 
-               if (current_center > (new_page/2)) {
-                       leftmost_after_zoom = current_center - (new_page / 2);
-               } else {
+               if (current_center < half_page_size) {
                        leftmost_after_zoom = 0;
+               } else {
+                       leftmost_after_zoom = current_center - half_page_size;
                }
                break;
                
        case ZoomFocusPlayhead:
-               /* try to keep the playhead in the center */
-               if (playhead_cursor->current_frame > new_page/2) {
-                       leftmost_after_zoom = playhead_cursor->current_frame - (new_page/2);
-               } else {
+               /* try to keep the playhead in the same place */
+
+               where = playhead_cursor->current_frame;
+               
+               l = - ((new_page_size * ((where - current_leftmost)/(double)current_page)) - where);
+
+               if (l < 0) {
                        leftmost_after_zoom = 0;
+               } else if (l > max_frames) { 
+                       leftmost_after_zoom = max_frames - new_page_size;
+               } else {
+                       leftmost_after_zoom = (nframes64_t) l;
+               }
+               break;
+
+       case ZoomFocusMouse:
+               /* try to keep the mouse over the same point in the display */
+
+               if (!mouse_frame (where, in_track_canvas)) {
+                       /* use playhead instead */
+                       where = playhead_cursor->current_frame;
+
+                       if (where < half_page_size) {
+                               leftmost_after_zoom = 0;
+                       } else {
+                               leftmost_after_zoom = where - half_page_size;
+                       }
+
+               } else {
+
+                       l = - ((new_page_size * ((where - current_leftmost)/(double)current_page)) - where);
+
+                       if (l < 0) {
+                               leftmost_after_zoom = 0;
+                       } else if (l > max_frames) { 
+                               leftmost_after_zoom = max_frames - new_page_size;
+                       } else {
+                               leftmost_after_zoom = (nframes64_t) l;
+                       }
                }
+
                break;
 
        case ZoomFocusEdit:
-               /* try to keep the edit cursor in the center */
-               if (edit_cursor->current_frame > new_page/2) {
-                       leftmost_after_zoom = edit_cursor->current_frame - (new_page/2);
+               /* try to keep the edit point in the same place */
+               where = get_preferred_edit_position ();
+
+               if (where > 0) {
+
+                       double l = - ((new_page_size * ((where - current_leftmost)/(double)current_page)) - where);
+
+                       if (l < 0) {
+                               leftmost_after_zoom = 0;
+                       } else if (l > max_frames) { 
+                               leftmost_after_zoom = max_frames - new_page_size;
+                       } else {
+                               leftmost_after_zoom = (nframes64_t) l;
+                       }
+
                } else {
-                       leftmost_after_zoom = 0;
+                       /* edit point not defined */
+                       return;
                }
                break;
                
@@ -1141,41 +1663,144 @@ Editor::temporal_zoom (gdouble fpu)
  
        // leftmost_after_zoom = min (leftmost_after_zoom, session->current_end_frame());
 
-//     begin_reversible_command (_("zoom"));
-//     session->add_undo (bind (mem_fun(*this, &Editor::reposition_and_zoom), current_leftmost, frames_per_unit));
-//     session->add_redo (bind (mem_fun(*this, &Editor::reposition_and_zoom), leftmost_after_zoom, nfpu));
-//     commit_reversible_command ();
-
        reposition_and_zoom (leftmost_after_zoom, nfpu);
 }      
 
 void
-Editor::temporal_zoom_selection ()
+Editor::temporal_zoom_region (bool both_axes)
 {
-       if (!selection) return;
-       
-       if (selection->time.empty()) {
+
+       nframes64_t start = max_frames;
+       nframes64_t end = 0;
+       RegionSelection rs; 
+       set<TimeAxisView*> tracks;
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
                return;
        }
 
-       nframes_t start = selection->time[clicked_selection].start;
-       nframes_t end = selection->time[clicked_selection].end;
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
 
-       temporal_zoom_by_frame (start, end, "zoom to selection");
-}
+               if ((*i)->region()->position() < start) {
+                       start = (*i)->region()->position();
+               }
 
-void
-Editor::temporal_zoom_session ()
-{
-       ENSURE_GUI_THREAD (mem_fun (*this, &Editor::temporal_zoom_session));
+               if ((*i)->region()->last_frame() + 1 > end) {
+                       end = (*i)->region()->last_frame() + 1;
+               }
 
-       if (session) {
-               temporal_zoom_by_frame (session->current_start_frame(), session->current_end_frame(), "zoom to session");
+               tracks.insert (&((*i)->get_time_axis_view()));
        }
+
+       /* now comes an "interesting" hack ... make sure we leave a little space
+          at each end of the editor so that the zoom doesn't fit the region
+          precisely to the screen.
+       */
+
+       GdkScreen* screen = gdk_screen_get_default ();
+       gint pixwidth = gdk_screen_get_width (screen);
+       gint mmwidth = gdk_screen_get_width_mm (screen);
+       double pix_per_mm = (double) pixwidth/ (double) mmwidth;
+       double one_centimeter_in_pixels = pix_per_mm * 10.0;
+
+       if ((start == 0 && end == 0) || end < start) {
+               return;
+       }
+
+       nframes64_t range = end - start;
+       double new_fpu = (double)range / (double)_canvas_width;
+       nframes64_t extra_samples = (nframes64_t) floor (one_centimeter_in_pixels * new_fpu);
+
+       if (start > extra_samples) {
+               start -= extra_samples;
+       } else {
+               start = 0;
+       } 
+
+       if (max_frames - extra_samples > end) {
+               end += extra_samples;
+       } else {
+               end = max_frames;
+       }
+
+       if (both_axes) {
+               /* save visual state with track states included, and prevent
+                  set_frames_per_unit() from doing it again.
+               */
+               undo_visual_stack.push_back (current_visual_state(true));
+               no_save_visual = true;
+       }
+
+       temporal_zoom_by_frame (start, end, "zoom to region");
+
+       if (both_axes) {
+               uint32_t per_track_height = (uint32_t) floor ((_canvas_height - canvas_timebars_vsize - 10.0) / tracks.size());
+               
+               /* set visible track heights appropriately */
+               
+               for (set<TimeAxisView*>::iterator t = tracks.begin(); t != tracks.end(); ++t) {
+                       (*t)->set_height (per_track_height);
+               }
+               
+               /* hide irrelevant tracks */
+
+               _routes->suspend_redisplay ();
+
+               for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+                       if (find (tracks.begin(), tracks.end(), (*i)) == tracks.end()) {
+                               hide_track_in_display (**i, true);
+                       }
+               }
+
+               _routes->resume_redisplay ();
+
+               vertical_adjustment.set_value (0.0);
+               no_save_visual = false;
+       }
+
+       zoomed_to_region = true;
+       redo_visual_stack.push_back (current_visual_state());
 }
 
 void
-Editor::temporal_zoom_by_frame (nframes_t start, nframes_t end, const string & op)
+Editor::toggle_zoom_region (bool both_axes)
+{
+       if (zoomed_to_region) {
+               swap_visual_state ();
+       } else {
+               temporal_zoom_region (both_axes);
+       }
+}
+
+void
+Editor::temporal_zoom_selection ()
+{
+       if (!selection) return;
+       
+       if (selection->time.empty()) {
+               return;
+       }
+
+       nframes64_t start = selection->time[clicked_selection].start;
+       nframes64_t end = selection->time[clicked_selection].end;
+
+       temporal_zoom_by_frame (start, end, "zoom to selection");
+}
+
+void
+Editor::temporal_zoom_session ()
+{
+       ENSURE_GUI_THREAD (mem_fun (*this, &Editor::temporal_zoom_session));
+
+       if (session) {
+               temporal_zoom_by_frame (session->current_start_frame(), session->current_end_frame(), "zoom to session");
+       }
+}
+
+void
+Editor::temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string & /*op*/)
 {
        if (!session) return;
 
@@ -1183,35 +1808,27 @@ Editor::temporal_zoom_by_frame (nframes_t start, nframes_t end, const string & o
                return;
        }
 
-       nframes_t range = end - start;
-
-       double new_fpu = (double)range / (double)canvas_width;
-//     double p2 = 1.0;
+       nframes64_t range = end - start;
 
-//     while (p2 < new_fpu) {
-//             p2 *= 2.0;
-//     }
-//     new_fpu = p2;
+       double new_fpu = (double)range / (double)_canvas_width;
        
-       nframes_t new_page = (nframes_t) floor (canvas_width * new_fpu);
-       nframes_t middle = (nframes_t) floor( (double)start + ((double)range / 2.0f ));
-       nframes_t new_leftmost = (nframes_t) floor( (double)middle - ((double)new_page/2.0f));
+       nframes64_t new_page = (nframes64_t) floor (_canvas_width * new_fpu);
+       nframes64_t middle = (nframes64_t) floor( (double)start + ((double)range / 2.0f ));
+       nframes64_t new_leftmost = (nframes64_t) floor( (double)middle - ((double)new_page/2.0f));
 
-       if (new_leftmost > middle) new_leftmost = 0;
-
-//     begin_reversible_command (op);
-//     session->add_undo (bind (mem_fun(*this, &Editor::reposition_and_zoom), leftmost_frame, frames_per_unit));
-//     session->add_redo (bind (mem_fun(*this, &Editor::reposition_and_zoom), new_leftmost, new_fpu));
-//     commit_reversible_command ();
+       if (new_leftmost > middle) {
+               new_leftmost = 0;
+       }
 
        reposition_and_zoom (new_leftmost, new_fpu);
 }
 
 void 
-Editor::temporal_zoom_to_frame (bool coarser, nframes_t frame)
+Editor::temporal_zoom_to_frame (bool coarser, nframes64_t frame)
 {
-       if (!session) return;
-       
+       if (!session) {
+               return;
+       }
        double range_before = frame - leftmost_frame;
        double new_fpu;
        
@@ -1225,12 +1842,15 @@ Editor::temporal_zoom_to_frame (bool coarser, nframes_t frame)
                range_before /= 1.61803399;
        }
 
-       if (new_fpu == frames_per_unit) return;
-
-       nframes_t new_leftmost = frame - (nframes_t)range_before;
+       if (new_fpu == frames_per_unit)  {
+               return;
+       }
 
-       if (new_leftmost > frame) new_leftmost = 0;
+       nframes64_t new_leftmost = frame - (nframes64_t)range_before;
 
+       if (new_leftmost > frame) {
+               new_leftmost = 0;
+       }
 //     begin_reversible_command (_("zoom to frame"));
 //     session->add_undo (bind (mem_fun(*this, &Editor::reposition_and_zoom), leftmost_frame, frames_per_unit));
 //     session->add_redo (bind (mem_fun(*this, &Editor::reposition_and_zoom), new_leftmost, new_fpu));
@@ -1239,6 +1859,46 @@ Editor::temporal_zoom_to_frame (bool coarser, nframes_t frame)
        reposition_and_zoom (new_leftmost, new_fpu);
 }
 
+
+bool
+Editor::choose_new_marker_name(string &name) {
+
+       if (!Config->get_name_new_markers()) {
+               /* don't prompt user for a new name */
+               return true;
+       }
+
+       ArdourPrompter dialog (true);
+
+       dialog.set_prompt (_("New Name:"));
+
+       WindowTitle title(Glib::get_application_name());
+       title += _("Name New Location Marker");
+
+       dialog.set_title(title.get_string());
+
+       dialog.set_name ("MarkNameWindow");
+       dialog.set_size_request (250, -1);
+       dialog.set_position (Gtk::WIN_POS_MOUSE);
+
+       dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
+       dialog.set_initial_text (name);
+
+       dialog.show ();
+
+       switch (dialog.run ()) {
+       case RESPONSE_ACCEPT:
+               break;
+       default:
+               return false;
+       }
+       
+       dialog.get_result(name);
+       return true;
+
+}
+
+
 void
 Editor::add_location_from_selection ()
 {
@@ -1248,12 +1908,12 @@ Editor::add_location_from_selection ()
                return;
        }
 
-       if (session == 0 || clicked_trackview == 0) {
+       if (session == 0 || clicked_axisview == 0) {
                return;
        }
 
-       nframes_t start = selection->time[clicked_selection].start;
-       nframes_t end = selection->time[clicked_selection].end;
+       nframes64_t start = selection->time[clicked_selection].start;
+       nframes64_t end = selection->time[clicked_selection].end;
 
        session->locations()->next_available_name(rangename,"selection");
        Location *location = new Location (start, end, rangename, Location::IsRangeMarker);
@@ -1267,13 +1927,16 @@ Editor::add_location_from_selection ()
 }
 
 void
-Editor::add_location_from_playhead_cursor ()
+Editor::add_location_mark (nframes64_t where)
 {
        string markername;
 
-       nframes_t where = session->audible_frame();
-       
+       select_new_marker = true;
+
        session->locations()->next_available_name(markername,"mark");
+       if (!choose_new_marker_name(markername)) {
+               return;
+       }
        Location *location = new Location (where, where, markername, Location::IsMark);
        session->begin_reversible_command (_("add marker"));
         XMLNode &before = session->locations()->get_state();
@@ -1284,21 +1947,77 @@ Editor::add_location_from_playhead_cursor ()
 }
 
 void
-Editor::add_location_from_audio_region ()
+Editor::add_location_from_playhead_cursor ()
 {
-       if (selection->regions.empty()) {
+       add_location_mark (session->audible_frame());
+}
+
+void
+Editor::add_locations_from_audio_region ()
+{
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
                return;
        }
 
-       RegionView* rv = *(selection->regions.begin());
-       boost::shared_ptr<Region> region = rv->region();
+       session->begin_reversible_command (rs.size () > 1 ? _("add markers") : _("add marker"));
+       XMLNode &before = session->locations()->get_state();
+       
+       cerr << "Add locations\n";
+
+       for (RegionSelection::iterator i = rs.begin (); i != rs.end (); ++i) {
+               
+               boost::shared_ptr<Region> region = (*i)->region ();
        
-       Location *location = new Location (region->position(), region->last_frame(), region->name(), Location::IsRangeMarker);
+               Location *location = new Location (region->position(), region->last_frame(), region->name(), Location::IsRangeMarker);
+               
+               session->locations()->add (location, true);
+       }
+
+       XMLNode &after = session->locations()->get_state();
+       session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
+       session->commit_reversible_command ();
+}
+
+void
+Editor::add_location_from_audio_region ()
+{
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
+               return;
+       }
+
        session->begin_reversible_command (_("add marker"));
-        XMLNode &before = session->locations()->get_state();
+       XMLNode &before = session->locations()->get_state();
+
+       string markername;
+
+       if (rs.size() > 1) {            // more than one region selected
+               session->locations()->next_available_name(markername, "regions");
+       } else {
+               RegionView* rv = *(rs.begin());
+               boost::shared_ptr<Region> region = rv->region();
+               markername = region->name();
+       }
+               
+       if (!choose_new_marker_name(markername)) {
+               return;
+       }
+
+       cerr << "Add location\n";
+
+       // single range spanning all selected 
+       Location *location = new Location (rs.start(), rs.end_frame(), markername, Location::IsRangeMarker);
        session->locations()->add (location, true);
-        XMLNode &after = session->locations()->get_state();
-       session->add_command(new MementoCommand<Locations>(*(session->locations()), &before, &after));
+
+       XMLNode &after = session->locations()->get_state();
+       session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
        session->commit_reversible_command ();
 }
 
@@ -1392,7 +2111,7 @@ Editor::jump_backward_to_mark ()
 void
 Editor::set_mark ()
 {
-       nframes_t pos;
+       nframes64_t pos;
        float prefix;
        bool was_floating;
        string markername;
@@ -1401,13 +2120,16 @@ Editor::set_mark ()
                pos = session->audible_frame ();
        } else {
                if (was_floating) {
-                       pos = (nframes_t) floor (prefix * session->frame_rate ());
+                       pos = (nframes64_t) floor (prefix * session->frame_rate ());
                } else {
-                       pos = (nframes_t) floor (prefix);
+                       pos = (nframes64_t) floor (prefix);
                }
        }
 
        session->locations()->next_available_name(markername,"mark");
+       if (!choose_new_marker_name(markername)) {
+               return;
+       }
        session->locations()->add (new Location (pos, 0, markername, Location::IsMark), true);
 }
 
@@ -1482,18 +2204,17 @@ Editor::unhide_ranges ()
 /* INSERT/REPLACE */
 
 void
-Editor::insert_region_list_drag (boost::shared_ptr<AudioRegion> region, int x, int y)
+Editor::insert_region_list_drag (boost::shared_ptr<Region> region, int x, int y)
 {
        double wx, wy;
        double cx, cy;
-       TimeAxisView *tv;
-       nframes_t where;
-       AudioTimeAxisView *atv = 0;
+       nframes64_t where;
+       RouteTimeAxisView *rtv = 0;
        boost::shared_ptr<Playlist> playlist;
        
-       track_canvas.window_to_world (x, y, wx, wy);
-       wx += horizontal_adjustment.get_value();
-       wy += vertical_adjustment.get_value();
+       track_canvas->window_to_world (x, y, wx, wy);
+       //wx += horizontal_adjustment.get_value();
+       //wy += vertical_adjustment.get_value();
 
        GdkEvent event;
        event.type = GDK_BUTTON_RELEASE;
@@ -1506,16 +2227,17 @@ Editor::insert_region_list_drag (boost::shared_ptr<AudioRegion> region, int x, i
                /* clearly outside canvas area */
                return;
        }
-       
-       if ((tv = trackview_by_y_position (cy)) == 0) {
+
+       std::pair<TimeAxisView*, int> tv = trackview_by_y_position (cy);
+       if (tv.first == 0) {
                return;
        }
        
-       if ((atv = dynamic_cast<AudioTimeAxisView*>(tv)) == 0) {
+       if ((rtv = dynamic_cast<RouteTimeAxisView*> (tv.first)) == 0) {
                return;
        }
 
-       if ((playlist = atv->playlist()) == 0) {
+       if ((playlist = rtv->playlist()) == 0) {
                return;
        }
        
@@ -1528,18 +2250,64 @@ Editor::insert_region_list_drag (boost::shared_ptr<AudioRegion> region, int x, i
        commit_reversible_command ();
 }
 
+void
+Editor::insert_route_list_drag (boost::shared_ptr<Route> route, int x, int y) {
+       double wx, wy;
+       double cx, cy;
+       nframes_t where;
+       RouteTimeAxisView *dest_rtv = 0;
+       RouteTimeAxisView *source_rtv = 0;
+
+       track_canvas->window_to_world (x, y, wx, wy);
+       wx += horizontal_adjustment.get_value();
+       wy += vertical_adjustment.get_value();
+
+       GdkEvent event;
+       event.type = GDK_BUTTON_RELEASE;
+       event.button.x = wx;
+       event.button.y = wy;
+
+       where = event_frame (&event, &cx, &cy);
+
+       std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (cy);
+       if (tv.first == 0) {
+               return;
+       }
+
+       if ((dest_rtv = dynamic_cast<RouteTimeAxisView*> (tv.first)) == 0) {
+               return;
+       }
+
+       /* use this drag source to add underlay to a track. But we really don't care 
+          about the Route, only the view of the route, so find it first */
+       for(TrackViewList::iterator it = track_views.begin(); it != track_views.end(); ++it) {
+               if((source_rtv = dynamic_cast<RouteTimeAxisView*>(*it)) == 0) {
+                       continue;
+               }
+               
+               if(source_rtv->route() == route && source_rtv != dest_rtv) {
+                       dest_rtv->add_underlay(source_rtv->view());
+                       break;
+               }
+       }
+}
+
 void
 Editor::insert_region_list_selection (float times)
 {
        RouteTimeAxisView *tv = 0;
        boost::shared_ptr<Playlist> playlist;
 
-       if (clicked_audio_trackview != 0) {
-               tv = clicked_audio_trackview;
+       if (clicked_routeview != 0) {
+               tv = clicked_routeview;
        } else if (!selection->tracks.empty()) {
                if ((tv = dynamic_cast<RouteTimeAxisView*>(selection->tracks.front())) == 0) {
                        return;
                }
+       } else if (entered_track != 0) {
+               if ((tv = dynamic_cast<RouteTimeAxisView*>(entered_track)) == 0) {
+                       return;
+               }
        } else {
                return;
        }
@@ -1547,29 +2315,17 @@ Editor::insert_region_list_selection (float times)
        if ((playlist = tv->playlist()) == 0) {
                return;
        }
-       
-       Glib::RefPtr<TreeSelection> selected = region_list_display.get_selection();
-       
-       if (selected->count_selected_rows() != 1) {
+
+       boost::shared_ptr<Region> region = _regions->get_single_selection ();
+       if (region == 0) {
                return;
        }
-       
-       TreeView::Selection::ListHandle_Path rows = selected->get_selected_rows ();
-
-       /* only one row selected, so rows.begin() is it */
-
-       TreeIter iter;
-
-       if ((iter = region_list_model->get_iter (*rows.begin()))) {
-
-               boost::shared_ptr<Region> region = (*iter)[region_list_columns.region];
                
-               begin_reversible_command (_("insert region"));
-               XMLNode &before = playlist->get_state();
-               playlist->add_region ((RegionFactory::create (region)), edit_cursor->current_frame, times);
-               session->add_command(new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
-               commit_reversible_command ();
-       } 
+       begin_reversible_command (_("insert region"));
+       XMLNode &before = playlist->get_state();
+       playlist->add_region ((RegionFactory::create (region)), get_preferred_edit_position(), times);
+       session->add_command(new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
+       commit_reversible_command ();
 }
 
 /* BUILT-IN EFFECTS */
@@ -1651,36 +2407,54 @@ Editor::play_from_start ()
 }
 
 void
-Editor::play_from_edit_cursor ()
+Editor::play_from_edit_point ()
 {
-       session->request_locate (edit_cursor->current_frame, true);
+       session->request_locate (get_preferred_edit_position(), true);
 }
 
 void
-Editor::play_selection ()
+Editor::play_from_edit_point_and_return ()
 {
-       if (selection->time.empty()) {
+       nframes64_t start_frame;
+       nframes64_t return_frame;
+
+       start_frame = get_preferred_edit_position (true);
+
+       if (session->transport_rolling()) {
+               session->request_locate (start_frame, false);
                return;
        }
 
-       session->request_play_range (true);
+       /* don't reset the return frame if its already set */
+
+       if ((return_frame = session->requested_return_frame()) < 0) {
+               return_frame = session->audible_frame();
+       }
+
+       if (start_frame >= 0) {
+               session->request_roll_at_and_return (start_frame, return_frame);
+       }
 }
 
 void
-Editor::play_selected_region ()
+Editor::play_selection ()
 {
-       if (!selection->regions.empty()) {
-               RegionView *rv = *(selection->regions.begin());
-
-               session->request_bounded_roll (rv->region()->position(), rv->region()->last_frame());   
+       if (selection->time.empty()) {
+               return;
        }
+
+       session->request_play_range (true);
 }
 
 void
 Editor::loop_selected_region ()
 {
-       if (!selection->regions.empty()) {
-               RegionView *rv = *(selection->regions.begin());
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (!rs.empty()) {
+               RegionView *rv = *(rs.begin());
                Location* tll;
 
                if ((tll = transport_loop_location()) != 0)  {
@@ -1748,69 +2522,66 @@ Editor::lower_region_to_bottom ()
        selection->foreach_region (&Region::lower_to_bottom);
 }
 
+/** Show the region editor for the selected regions */
 void
 Editor::edit_region ()
 {
-       if (clicked_regionview == 0) {
-               return;
-       }
-       
-       clicked_regionview->show_region_editor ();
+       selection->foreach_regionview (&RegionView::show_region_editor);
 }
 
 void
-Editor::rename_region ()
+Editor::rename_region()
 {
-       Dialog dialog;
-       Entry  entry;
-       Button ok_button (_("OK"));
-       Button cancel_button (_("Cancel"));
+       RegionSelection rs; 
 
-       if (selection->regions.empty()) {
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
                return;
        }
 
-       WindowTitle title(Glib::get_application_name());
+       WindowTitle title (Glib::get_application_name());
        title += _("Rename Region");
 
-       dialog.set_title (title.get_string());
-       dialog.set_name ("RegionRenameWindow");
-       dialog.set_size_request (300, -1);
-       dialog.set_position (Gtk::WIN_POS_MOUSE);
-       dialog.set_modal (true);
+       ArdourDialog d (*this, title.get_string(), true, false);
+       Entry entry;
+       Label label (_("New name:"));
+       HBox hbox;
 
-       dialog.get_vbox()->set_border_width (10);
-       dialog.get_vbox()->pack_start (entry);
-       dialog.get_action_area()->pack_start (ok_button);
-       dialog.get_action_area()->pack_start (cancel_button);
+       hbox.set_spacing (6);
+       hbox.pack_start (label, false, false);
+       hbox.pack_start (entry, true, true);
 
-       entry.set_name ("RegionNameDisplay");
-       ok_button.set_name ("EditorGTKButton");
-       cancel_button.set_name ("EditorGTKButton");
+       d.get_vbox()->set_border_width (12);
+       d.get_vbox()->pack_start (hbox, false, false);
 
-       region_renamed = false;
+       d.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
+       d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
 
-       entry.signal_activate().connect (bind (mem_fun(*this, &Editor::rename_region_finished), true));
-       ok_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::rename_region_finished), true));
-       cancel_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::rename_region_finished), false));
+       d.set_size_request (300, -1);
+       d.set_position (Gtk::WIN_POS_MOUSE);
 
-       /* recurse */
+       entry.set_text (rs.front()->region()->name());
+       entry.select_region (0, -1);
 
-       dialog.show_all ();
-       Main::run ();
+       entry.signal_activate().connect (bind (mem_fun (d, &Dialog::response), RESPONSE_OK));
+       
+       d.show_all ();
+       
+       entry.grab_focus();
 
-       if (region_renamed) {
-               (*selection->regions.begin())->region()->set_name (entry.get_text());
-               redisplay_regions ();
-       }
-}
+       int ret = d.run();
 
-void
-Editor::rename_region_finished (bool status)
+       d.hide ();
 
-{
-       region_renamed = status;
-       Main::quit ();
+       if (ret == RESPONSE_OK) {
+               std::string str = entry.get_text();
+               strip_whitespace_edges (str);
+               if (!str.empty()) {
+                       rs.front()->region()->set_name (str);
+                       _regions->redisplay ();
+               }
+       }
 }
 
 void
@@ -1832,13 +2603,41 @@ Editor::audition_playlist_region_via_route (boost::shared_ptr<Region> region, Ro
        /* XXX how to unset the solo state ? */
 }
 
+/** Start an audition of the first selected region */
 void
-Editor::audition_selected_region ()
+Editor::play_edit_range ()
 {
-       if (!selection->regions.empty()) {
-               RegionView* rv = *(selection->regions.begin());
-               session->audition_region (rv->region());
+       nframes64_t start, end;
+
+       if (get_edit_op_range (start, end)) {
+               session->request_bounded_roll (start, end);
+       }
+}
+
+void
+Editor::play_selected_region ()
+{
+       nframes64_t start = max_frames;
+       nframes64_t end = 0;
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+        
+       if (rs.empty()) {
+               return;
+       }
+
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+               if ((*i)->region()->position() < start) {
+                       start = (*i)->region()->position();
+               }
+               if ((*i)->region()->last_frame() + 1 > end) {
+                       end = (*i)->region()->last_frame() + 1;
+               }
        }
+
+       session->request_stop ();
+       session->request_bounded_roll (start, end);
 }
 
 void
@@ -1854,6 +2653,11 @@ Editor::build_interthread_progress_window ()
 
        interthread_progress_bar.set_orientation (Gtk::PROGRESS_LEFT_TO_RIGHT);
        
+       interthread_progress_window->set_border_width (12);
+       interthread_progress_window->get_vbox()->set_spacing (6);
+
+       interthread_progress_label.set_alignment (0.5, 0.5);
+
        interthread_progress_window->get_vbox()->pack_start (interthread_progress_label, false, false);
        interthread_progress_window->get_vbox()->pack_start (interthread_progress_bar,false, false);
 
@@ -1878,7 +2682,7 @@ Editor::interthread_cancel_clicked ()
 void
 Editor::region_from_selection ()
 {
-       if (clicked_trackview == 0) {
+       if (clicked_axisview == 0) {
                return;
        }
 
@@ -1886,94 +2690,83 @@ Editor::region_from_selection ()
                return;
        }
 
-       nframes_t start = selection->time[clicked_selection].start;
-       nframes_t end = selection->time[clicked_selection].end;
+       nframes64_t start = selection->time[clicked_selection].start;
+       nframes64_t end = selection->time[clicked_selection].end;
 
-       nframes_t selection_cnt = end - start + 1;
+       TrackSelection tracks = get_tracks_for_range_action ();
+
+       nframes64_t selection_cnt = end - start + 1;
        
-       for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
-               boost::shared_ptr<AudioRegion> current;
-               boost::shared_ptr<Region> current_r;
+       for (TrackSelection::iterator i = tracks.begin(); i != tracks.end(); ++i) {
+               boost::shared_ptr<Region> current;
                boost::shared_ptr<Playlist> pl;
-
-               nframes_t internal_start;
+               nframes64_t internal_start;
                string new_name;
 
                if ((pl = (*i)->playlist()) == 0) {
                        continue;
                }
 
-               if ((current_r = pl->top_region_at (start)) == 0) {
+               if ((current = pl->top_region_at (start)) == 0) {
                        continue;
                }
 
-               current = boost::dynamic_pointer_cast<AudioRegion> (current_r);
-               // FIXME: audio only
-               if (current != 0) {
-                       internal_start = start - current->position();
-                       session->region_name (new_name, current->name(), true);
-                       boost::shared_ptr<Region> region (RegionFactory::create (current, internal_start, selection_cnt, new_name));
-               }
+               internal_start = start - current->position();
+               session->region_name (new_name, current->name(), true);
+               boost::shared_ptr<Region> region (RegionFactory::create (current,
+                               internal_start, selection_cnt, new_name));
        }
 }      
 
 void
-Editor::create_region_from_selection (vector<boost::shared_ptr<AudioRegion> >& new_regions)
+Editor::create_region_from_selection (vector<boost::shared_ptr<Region> >& new_regions)
 {
        if (selection->time.empty() || selection->tracks.empty()) {
                return;
        }
 
-       nframes_t start = selection->time[clicked_selection].start;
-       nframes_t end = selection->time[clicked_selection].end;
+       nframes64_t start = selection->time[clicked_selection].start;
+       nframes64_t end = selection->time[clicked_selection].end;
        
        sort_track_selection ();
 
        for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
-
-               boost::shared_ptr<AudioRegion> current;
-               boost::shared_ptr<Region> current_r;
+               boost::shared_ptr<Region> current;
                boost::shared_ptr<Playlist> playlist;
-               nframes_t internal_start;
+               nframes64_t internal_start;
                string new_name;
 
                if ((playlist = (*i)->playlist()) == 0) {
                        continue;
                }
 
-               if ((current_r = playlist->top_region_at(start)) == 0) {
+               if ((current = playlist->top_region_at(start)) == 0) {
                        continue;
                }
 
-               if ((current = boost::dynamic_pointer_cast<AudioRegion>(current_r)) == 0) {
-                       continue;
-               }
-       
                internal_start = start - current->position();
                session->region_name (new_name, current->name(), true);
-               
-               new_regions.push_back (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (current, internal_start, end - start + 1, new_name)));
+
+               new_regions.push_back (RegionFactory::create (current,
+                                       internal_start, end - start + 1, new_name));
        }
 }
 
 void
 Editor::split_multichannel_region ()
 {
-       if (selection->regions.empty()) {
-               return;
-       }
+       RegionSelection rs; 
 
-       vector<boost::shared_ptr<AudioRegion> > v;
+       get_regions_for_action (rs);
 
-       for (list<RegionView*>::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) {
+       if (rs.empty()) {
+               return;
+       }
 
-               AudioRegionView* arv = dynamic_cast<AudioRegionView*>(*x);
-               
-               if (!arv || arv->audio_region()->n_channels() < 2) {
-                       continue;
-               }
+       vector< boost::shared_ptr<Region> > v;
 
-               (arv)->audio_region()->separate_by_channel (*session, v);
+       for (list<RegionView*>::iterator x = rs.begin(); x != rs.end(); ++x) {
+               (*x)->region()->separate_by_channel (*session, v);
        }
 }
 
@@ -1984,144 +2777,246 @@ Editor::new_region_from_selection ()
        cancel_selection ();
 }
 
-void
-Editor::separate_region_from_selection ()
+static void
+add_if_covered (RegionView* rv, const AudioRange* ar, RegionSelection* rs)
 {
-       bool doing_undo = false;
+       switch (rv->region()->coverage (ar->start, ar->end - 1)) {
+       case OverlapNone:
+               break;
+       default:
+               rs->push_back (rv);
+       }
+}
 
-       if (selection->time.empty()) {
-               return;
+/** Return either:
+ *    - selected tracks, or if there are none...
+ *    - tracks containing selected regions, or if there are none...
+ *    - all tracks
+ * @return tracks.
+ */
+TrackSelection
+Editor::get_tracks_for_range_action () const
+{
+       TrackSelection t;
+       
+       if (selection->tracks.empty()) {
+               
+               /* use tracks with selected regions */
+
+               RegionSelection rs = selection->regions;
+
+               for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+                       TimeAxisView* tv = &(*i)->get_time_axis_view();
+
+                       if (!t.contains (tv)) {
+                               t.push_back (tv);
+                       }
+               }
+
+               if (t.empty()) {
+                       /* no regions and no tracks: use all tracks */
+                       t = track_views;
+               }
+
+       } else {
+
+               t = selection->tracks;
        }
 
+       return t;
+}
+
+void
+Editor::separate_regions_between (const TimeSelection& ts)
+{
+       bool in_command = false;
        boost::shared_ptr<Playlist> playlist;
-               
-       sort_track_selection ();
+       RegionSelection new_selection;
 
-       for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
+       TrackSelection tmptracks = get_tracks_for_range_action ();
+       sort_track_selection (&tmptracks);
 
-               AudioTimeAxisView* atv;
+       for (TrackSelection::iterator i = tmptracks.begin(); i != tmptracks.end(); ++i) {
+
+               RouteTimeAxisView* rtv;
 
-               if ((atv = dynamic_cast<AudioTimeAxisView*> ((*i))) != 0) {
+               if ((rtv = dynamic_cast<RouteTimeAxisView*> ((*i))) != 0) {
 
-                       if (atv->is_audio_track()) {
+                       if (rtv->is_track()) {
 
                                /* no edits to destructive tracks */
 
-                               if (atv->audio_track()->audio_diskstream()->destructive()) {
+                               if (rtv->track()->diskstream()->destructive()) {
                                        continue;
                                }
                                        
-                               if ((playlist = atv->playlist()) != 0) {
-                                       if (!doing_undo) {
-                                               begin_reversible_command (_("separate"));
-                                               doing_undo = true;
-                                       }
-                                        XMLNode *before;
-                                       if (doing_undo) 
-                                            before = &(playlist->get_state());
-                       
+                               if ((playlist = rtv->playlist()) != 0) {
+
+                                       XMLNode *before;
+                                       bool got_some;
+
+                                       before = &(playlist->get_state());
+                                       got_some = false;
+
                                        /* XXX need to consider musical time selections here at some point */
 
-                                       double speed = atv->get_diskstream()->speed();
+                                       double speed = rtv->get_diskstream()->speed();
+
+
+                                       for (list<AudioRange>::const_iterator t = ts.begin(); t != ts.end(); ++t) {
+
+                                               sigc::connection c = rtv->view()->RegionViewAdded.connect (
+                                                               mem_fun(*this, &Editor::collect_new_region_view));
+                                               latest_regionviews.clear ();
 
-                                       for (list<AudioRange>::iterator t = selection->time.begin(); t != selection->time.end(); ++t) {
-                                               playlist->partition ((nframes_t)((*t).start * speed), (nframes_t)((*t).end * speed), true);
+                                               playlist->partition ((nframes64_t)((*t).start * speed),
+                                                               (nframes64_t)((*t).end * speed), true);
+
+                                               c.disconnect ();
+
+                                               if (!latest_regionviews.empty()) {
+                                                       
+                                                       got_some = true;
+
+                                                       rtv->view()->foreach_regionview (bind (
+                                                                               sigc::ptr_fun (add_if_covered),
+                                                                               &(*t), &new_selection));
+                                                       
+                                                       if (!in_command) {
+                                                               begin_reversible_command (_("separate"));
+                                                               in_command = true;
+                                                       }
+                                                       
+                                                       session->add_command(new MementoCommand<Playlist>(
+                                                                       *playlist, before, &playlist->get_state()));
+                                               } 
                                        }
 
-                                       if (doing_undo) 
-                                            session->add_command(new MementoCommand<Playlist>(*playlist, before, &playlist->get_state()));
+                                       if (!got_some) {
+                                               delete before;
+                                       }
                                }
                        }
                }
        }
 
-       if (doing_undo) commit_reversible_command ();
+       if (in_command) {
+               selection->set (new_selection);
+               set_mouse_mode (MouseObject);
+
+               commit_reversible_command ();
+       }
 }
 
+/** Take tracks from get_tracks_for_range_action and cut any regions
+ *  on those tracks so that the tracks are empty over the time
+ *  selection.
+ */
 void
-Editor::separate_regions_using_location (Location& loc)
+Editor::separate_region_from_selection ()
 {
-       bool doing_undo = false;
-
-       if (loc.is_mark()) {
-               return;
-       }
-
-       boost::shared_ptr<Playlist> playlist;
-
-       /* XXX i'm unsure as to whether this should operate on selected tracks only 
-          or the entire enchillada. uncomment the below line to correct the behaviour 
-          (currently set for all tracks)
+       /* preferentially use *all* ranges in the time selection if we're in range mode
+          to allow discontiguous operation, since get_edit_op_range() currently
+          returns a single range.
        */
 
-       for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {    
-       //for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
+       if (mouse_mode == MouseRange && !selection->time.empty()) {
 
-               AudioTimeAxisView* atv;
+               separate_regions_between (selection->time);
 
-               if ((atv = dynamic_cast<AudioTimeAxisView*> ((*i))) != 0) {
-
-                       if (atv->is_audio_track()) {
-                                       
-                               /* no edits to destructive tracks */
-
-                               if (atv->audio_track()->audio_diskstream()->destructive()) {
-                                       continue;
-                               }
+       } else {
 
-                               if ((playlist = atv->playlist()) != 0) {
-                                        XMLNode *before;
-                                       if (!doing_undo) {
-                                               begin_reversible_command (_("separate"));
-                                               doing_undo = true;
-                                       }
-                                       if (doing_undo) 
-                                            before = &(playlist->get_state());
-                                            
+               nframes64_t start;
+               nframes64_t end;
+               
+               if (get_edit_op_range (start, end)) {
                        
-                                       /* XXX need to consider musical time selections here at some point */
+                       AudioRange ar (start, end, 1);
+                       TimeSelection ts;
+                       ts.push_back (ar);
+
+                       separate_regions_between (ts);
+               }
+       }
+}
 
-                                       double speed = atv->get_diskstream()->speed();
+void
+Editor::separate_region_from_punch ()
+{
+       Location* loc  = session->locations()->auto_punch_location();
+       if (loc) {
+               separate_regions_using_location (*loc);
+       }
+}
 
+void
+Editor::separate_region_from_loop ()
+{
+       Location* loc  = session->locations()->auto_loop_location();
+       if (loc) {
+               separate_regions_using_location (*loc);
+       }
+}
 
-                                       playlist->partition ((nframes_t)(loc.start() * speed), (nframes_t)(loc.end() * speed), true);
-                                       if (doing_undo) 
-                                            session->add_command(new MementoCommand<Playlist>(*playlist, before, &playlist->get_state()));
-                               }
-                       }
-               }
+void
+Editor::separate_regions_using_location (Location& loc)
+{
+       if (loc.is_mark()) {
+               return;
        }
 
-       if (doing_undo) commit_reversible_command ();
+       AudioRange ar (loc.start(), loc.end(), 1);
+       TimeSelection ts;
+
+       ts.push_back (ar);
+
+       separate_regions_between (ts);
 }
 
 void
 Editor::crop_region_to_selection ()
 {
-       if (selection->time.empty() || selection->tracks.empty()) {
-               return;
+       if (!selection->time.empty()) {
+
+               crop_region_to (selection->time.start(), selection->time.end_frame());
+
+       } else {
+
+               nframes64_t start;
+               nframes64_t end;
+
+               if (get_edit_op_range (start, end)) {
+                       crop_region_to (start, end);
+               }
        }
+               
+}              
 
+void
+Editor::crop_region_to (nframes64_t start, nframes64_t end)
+{
        vector<boost::shared_ptr<Playlist> > playlists;
        boost::shared_ptr<Playlist> playlist;
+       TrackSelection* ts;
 
-       sort_track_selection ();
+       if (selection->tracks.empty()) {
+               ts = &track_views;
+       } else {
+               sort_track_selection ();
+               ts = &selection->tracks;
+       }
        
-       for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
+       for (TrackSelection::iterator i = ts->begin(); i != ts->end(); ++i) {
                
-               AudioTimeAxisView* atv;
+               RouteTimeAxisView* rtv;
                
-               if ((atv = dynamic_cast<AudioTimeAxisView*> ((*i))) != 0) {
-                       
-                       if (atv->is_audio_track()) {
-                               
-                               /* no edits to destructive tracks */
+               if ((rtv = dynamic_cast<RouteTimeAxisView*> ((*i))) != 0) {
 
-                               if (atv->audio_track()->audio_diskstream()->destructive()) {
-                                       continue;
-                               }
+                       boost::shared_ptr<Track> t = rtv->track();
 
-                               if ((playlist = atv->playlist()) != 0) {
+                       if (t != 0 && ! t->diskstream()->destructive()) {
+                               
+                               if ((playlist = rtv->playlist()) != 0) {
                                        playlists.push_back (playlist);
                                }
                        }
@@ -2132,19 +3027,19 @@ Editor::crop_region_to_selection ()
                return;
        }
                
-       nframes_t start;
-       nframes_t end;
-       nframes_t cnt;
+       nframes64_t the_start;
+       nframes64_t the_end;
+       nframes64_t cnt;
        
        begin_reversible_command (_("trim to selection"));
        
        for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists.begin(); i != playlists.end(); ++i) {
                
                boost::shared_ptr<Region> region;
-               
-               start = selection->time.start();
-               
-               if ((region = (*i)->top_region_at(start)) == 0) {
+       
+               the_start = start;
+       
+               if ((region = (*i)->top_region_at(the_start)) == 0) {
                        continue;
                }
                
@@ -2152,17 +3047,17 @@ Editor::crop_region_to_selection ()
                   if the selection extends beyond the region
                */
                
-               start = max (start, region->position());
-               if (max_frames - start < region->length()) {
-                       end = start + region->length() - 1;
+               the_start = max (the_start, (nframes64_t) region->position());
+               if (max_frames - the_start < region->length()) {
+                       the_end = the_start + region->length() - 1;
                } else {
-                       end = max_frames;
+                       the_end = max_frames;
                }
-               end = min (selection->time.end_frame(), end);
-               cnt = end - start + 1;
+               the_end = min (end, the_end);
+               cnt = the_end - the_start + 1;
                
                XMLNode &before = (*i)->get_state();
-               region->trim_to (start, cnt, this);
+               region->trim_to (the_start, cnt, this);
                XMLNode &after = (*i)->get_state();
                session->add_command (new MementoCommand<Playlist>(*(*i), &before, &after));
        }
@@ -2173,9 +3068,12 @@ Editor::crop_region_to_selection ()
 void
 Editor::region_fill_track ()
 {
-       nframes_t end;
+       nframes64_t end;
+       RegionSelection rs; 
 
-       if (!session || selection->regions.empty()) {
+       get_regions_for_action (rs);
+
+       if (!session || rs.empty()) {
                return;
        }
 
@@ -2183,14 +3081,13 @@ Editor::region_fill_track ()
 
        begin_reversible_command (_("region fill"));
 
-       for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
 
                boost::shared_ptr<Region> region ((*i)->region());
                
                // FIXME
                boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(region);
-               if (!ar)
-                       continue;
+               assert(ar);
 
                boost::shared_ptr<Playlist> pl = region->playlist();
 
@@ -2204,7 +3101,7 @@ Editor::region_fill_track ()
                        return;
                }
 
-                XMLNode &before = pl->get_state();
+               XMLNode &before = pl->get_state();
                pl->add_region (RegionFactory::create (ar), ar->last_frame(), times);
                session->add_command (new MementoCommand<Playlist>(*pl, &before, &pl->get_state()));
        }
@@ -2215,7 +3112,7 @@ Editor::region_fill_track ()
 void
 Editor::region_fill_selection ()
 {
-               if (clicked_audio_trackview == 0 || !clicked_audio_trackview->is_audio_track()) {
+       if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) {
                return;
        }
 
@@ -2223,18 +3120,13 @@ Editor::region_fill_selection ()
                return;
        }
 
-
-       Glib::RefPtr<TreeSelection> selected = region_list_display.get_selection();
-
-       if (selected->count_selected_rows() != 1) {
+       boost::shared_ptr<Region> region = _regions->get_single_selection ();
+       if (region == 0) {
                return;
        }
 
-       TreeModel::iterator i = region_list_display.get_selection()->get_selected();
-       boost::shared_ptr<Region> region = (*i)[region_list_columns.region];
-
-       nframes_t start = selection->time[clicked_selection].start;
-       nframes_t end = selection->time[clicked_selection].end;
+       nframes64_t start = selection->time[clicked_selection].start;
+       nframes64_t end = selection->time[clicked_selection].end;
 
        boost::shared_ptr<Playlist> playlist; 
 
@@ -2242,7 +3134,7 @@ Editor::region_fill_selection ()
                return;
        }
 
-       nframes_t selection_length = end - start;
+       nframes64_t selection_length = end - start;
        float times = (float)selection_length / region->length();
        
        begin_reversible_command (_("fill selection"));
@@ -2262,64 +3154,79 @@ Editor::region_fill_selection ()
 }
 
 void
-Editor::set_a_regions_sync_position (boost::shared_ptr<Region> region, nframes_t position)
+Editor::set_region_sync_from_edit_point ()
 {
-
-       if (!region->covers (position)) {
-         error << _("Programming error. that region doesn't cover that position") << __FILE__ << " +" << __LINE__ << endmsg;
-               return;
-       }
-       begin_reversible_command (_("set region sync position"));
-        XMLNode &before = region->playlist()->get_state();
-       region->set_sync_position (position);
-        XMLNode &after = region->playlist()->get_state();
-       session->add_command(new MementoCommand<Playlist>(*(region->playlist()), &before, &after));
-       commit_reversible_command ();
+       nframes64_t where = get_preferred_edit_position ();
+       RegionSelection rs;
+       get_regions_for_action (rs);
+       set_sync_point (where, rs);
 }
 
 void
-Editor::set_region_sync_from_edit_cursor ()
+Editor::set_sync_point (nframes64_t where, const RegionSelection& rs)
 {
-       if (clicked_regionview == 0) {
-               return;
-       }
+       bool in_command = false;
 
-       if (!clicked_regionview->region()->covers (edit_cursor->current_frame)) {
-               error << _("Place the edit cursor at the desired sync point") << endmsg;
-               return;
+       for (RegionSelection::const_iterator r = rs.begin(); r != rs.end(); ++r) {
+               
+               if (!(*r)->region()->covers (where)) {
+                       continue;
+               }
+
+               boost::shared_ptr<Region> region ((*r)->region());
+
+               if (!in_command) {
+                       begin_reversible_command (_("set sync point"));
+                       in_command = true;
+               }
+
+               XMLNode &before = region->playlist()->get_state();
+               region->set_sync_position (get_preferred_edit_position());
+               XMLNode &after = region->playlist()->get_state();
+               session->add_command(new MementoCommand<Playlist>(*(region->playlist()), &before, &after));
        }
 
-       boost::shared_ptr<Region> region (clicked_regionview->region());
-       begin_reversible_command (_("set sync from edit cursor"));
-        XMLNode &before = region->playlist()->get_state();
-       region->set_sync_position (edit_cursor->current_frame);
-        XMLNode &after = region->playlist()->get_state();
-       session->add_command(new MementoCommand<Playlist>(*(region->playlist()), &before, &after));
-       commit_reversible_command ();
+       if (in_command) {
+               commit_reversible_command ();
+       }
 }
 
+/** Remove the sync positions of the selection */
 void
 Editor::remove_region_sync ()
 {
-       if (clicked_regionview) {
-               boost::shared_ptr<Region> region (clicked_regionview->region());
-               begin_reversible_command (_("remove sync"));
-                XMLNode &before = region->playlist()->get_state();
-               region->clear_sync_position ();
-                XMLNode &after = region->playlist()->get_state();
-               session->add_command(new MementoCommand<Playlist>(*(region->playlist()), &before, &after));
-               commit_reversible_command ();
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
+               return;
+       }
+
+       begin_reversible_command (_("remove sync"));
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+
+                XMLNode &before = (*i)->region()->playlist()->get_state();
+               (*i)->region()->clear_sync_position ();
+                XMLNode &after = (*i)->region()->playlist()->get_state();
+               session->add_command(new MementoCommand<Playlist>(*((*i)->region()->playlist()), &before, &after));
        }
+       commit_reversible_command ();
 }
 
 void
 Editor::naturalize ()
 {
-       if (selection->regions.empty()) {
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
                return;
        }
+
        begin_reversible_command (_("naturalize"));
-       for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
                 XMLNode &before = (*i)->region()->get_state();
                (*i)->region()->move_to_natural_position (this);
                 XMLNode &after = (*i)->region()->get_state();
@@ -2331,61 +3238,107 @@ Editor::naturalize ()
 void
 Editor::align (RegionPoint what)
 {
-       align_selection (what, edit_cursor->current_frame);
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+       nframes64_t where = get_preferred_edit_position();
+
+       if (!rs.empty()) {
+               align_selection (what, where, rs);
+       } else {
+
+               RegionSelection rs;
+               get_regions_at (rs, where, selection->tracks);
+               align_selection (what, where, rs);
+       }
 }
 
 void
 Editor::align_relative (RegionPoint what)
 {
-       align_selection_relative (what, edit_cursor->current_frame);
+       nframes64_t where = get_preferred_edit_position();
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (!rs.empty()) {
+               align_selection_relative (what, where, rs);
+       } 
 }
 
 struct RegionSortByTime {
-    bool operator() (const AudioRegionView* a, const AudioRegionView* b) {
+    bool operator() (const RegionView* a, const RegionView* b) {
            return a->region()->position() < b->region()->position();
     }
 };
 
 void
-Editor::align_selection_relative (RegionPoint point, nframes_t position)
+Editor::align_selection_relative (RegionPoint point, nframes64_t position, const RegionSelection& rs)
 {
-       if (selection->regions.empty()) {
+       if (rs.empty()) {
                return;
        }
 
-       nframes_t distance;
-       nframes_t pos = 0;
-       int dir;
+       nframes64_t distance = 0;
+       nframes64_t pos = 0;
+       int dir = 1;
 
        list<RegionView*> sorted;
-       selection->regions.by_position (sorted);
+       rs.by_position (sorted);
+
        boost::shared_ptr<Region> r ((*sorted.begin())->region());
 
        switch (point) {
        case Start:
-               pos = r->first_frame ();
+               pos = position;
+               if (position > r->position()) {
+                       distance = position - r->position();
+               } else {
+                       distance = r->position() - position;
+                       dir = -1;
+               }
                break;
-
+               
        case End:
-               pos = r->last_frame();
+               if (position > r->last_frame()) {
+                       distance = position - r->last_frame();
+                       pos = r->position() + distance;
+               } else {
+                       distance = r->last_frame() - position;
+                       pos = r->position() - distance;
+                       dir = -1;
+               }
                break;
 
        case SyncPoint:
-               pos = r->adjust_to_sync (r->first_frame());
+               pos = r->adjust_to_sync (position);
+               if (pos > r->position()) {
+                       distance = pos - r->position();
+               } else {
+                       distance = r->position() - pos;
+                       dir = -1;
+               }
                break;  
        }
 
-       if (pos > position) {
-               distance = pos - position;
-               dir = -1;
-       } else {
-               distance = position - pos;
-               dir = 1;
+       if (pos == r->position()) {
+               return;
        }
 
        begin_reversible_command (_("align selection (relative)"));
 
-       for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+       /* move first one specially */
+
+       XMLNode &before = r->playlist()->get_state();
+       r->set_position (pos, this);
+       XMLNode &after = r->playlist()->get_state();
+       session->add_command(new MementoCommand<Playlist>(*(r->playlist()), &before, &after));
+
+       /* move rest by the same amount */
+       
+       sorted.pop_front();
+       
+       for (list<RegionView*>::iterator i = sorted.begin(); i != sorted.end(); ++i) {
 
                boost::shared_ptr<Region> region ((*i)->region());
 
@@ -2406,15 +3359,15 @@ Editor::align_selection_relative (RegionPoint point, nframes_t position)
 }
 
 void
-Editor::align_selection (RegionPoint point, nframes_t position)
+Editor::align_selection (RegionPoint point, nframes64_t position, const RegionSelection& rs)
 {
-       if (selection->regions.empty()) {
+       if (rs.empty()) {
                return;
        }
 
        begin_reversible_command (_("align selection"));
 
-       for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+       for (RegionSelection::const_iterator i = rs.begin(); i != rs.end(); ++i) {
                align_region_internal ((*i)->region(), point, position);
        }
 
@@ -2422,7 +3375,7 @@ Editor::align_selection (RegionPoint point, nframes_t position)
 }
 
 void
-Editor::align_region (boost::shared_ptr<Region> region, RegionPoint point, nframes_t position)
+Editor::align_region (boost::shared_ptr<Region> region, RegionPoint point, nframes64_t position)
 {
        begin_reversible_command (_("align region"));
        align_region_internal (region, point, position);
@@ -2430,7 +3383,7 @@ Editor::align_region (boost::shared_ptr<Region> region, RegionPoint point, nfram
 }
 
 void
-Editor::align_region_internal (boost::shared_ptr<Region> region, RegionPoint point, nframes_t position)
+Editor::align_region_internal (boost::shared_ptr<Region> region, RegionPoint point, nframes64_t position)
 {
        XMLNode &before = region->playlist()->get_state();
 
@@ -2455,99 +3408,316 @@ Editor::align_region_internal (boost::shared_ptr<Region> region, RegionPoint poi
 }      
 
 void
-Editor::trim_region_to_edit_cursor ()
+Editor::trim_region_front ()
 {
-       if (clicked_regionview == 0) {
-               return;
-       }
-
-       boost::shared_ptr<Region> region (clicked_regionview->region());
-
-       float speed = 1.0f;
-       AudioTimeAxisView *atav;
-
-       if ( clicked_trackview != 0 && (atav = dynamic_cast<AudioTimeAxisView*>(clicked_trackview)) != 0 ) {
-               if (atav->get_diskstream() != 0) {
-                       speed = atav->get_diskstream()->speed();
-               }
-       }
+       trim_region (true);
+}
 
-       begin_reversible_command (_("trim to edit"));
-        XMLNode &before = region->playlist()->get_state();
-       region->trim_end( session_frame_to_track_frame(edit_cursor->current_frame, speed), this);
-        XMLNode &after = region->playlist()->get_state();
-       session->add_command(new MementoCommand<Playlist>(*(region->playlist()), &before, &after));
-       commit_reversible_command ();
+void
+Editor::trim_region_back ()
+{
+       trim_region (false);
 }
 
 void
-Editor::trim_region_from_edit_cursor ()
+Editor::trim_region (bool front)
 {
-       if (clicked_regionview == 0) {
+       nframes64_t where = get_preferred_edit_position();
+       RegionSelection rs;
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
                return;
        }
 
-       boost::shared_ptr<Region> region (clicked_regionview->region());
-
-       float speed = 1.0f;
-       AudioTimeAxisView *atav;
+       begin_reversible_command (front ? _("trim front") : _("trim back"));
 
-       if ( clicked_trackview != 0 && (atav = dynamic_cast<AudioTimeAxisView*>(clicked_trackview)) != 0 ) {
-               if (atav->get_diskstream() != 0) {
-                       speed = atav->get_diskstream()->speed();
+       for (list<RegionView*>::const_iterator i = rs.by_layer().begin(); i != rs.by_layer().end(); ++i) {
+               if (!(*i)->region()->locked()) {
+                       boost::shared_ptr<Playlist> pl = (*i)->region()->playlist();
+                       XMLNode &before = pl->get_state();
+                       if (front) {
+                               (*i)->region()->trim_front (where, this);       
+                       } else {
+                               (*i)->region()->trim_end (where, this); 
+                       }
+                       XMLNode &after = pl->get_state();
+                       session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
                }
        }
 
-       begin_reversible_command (_("trim to edit"));
-        XMLNode &before = region->playlist()->get_state();
-       region->trim_front ( session_frame_to_track_frame(edit_cursor->current_frame, speed), this);
-        XMLNode &after = region->playlist()->get_state();
-       session->add_command(new MementoCommand<Playlist>(*(region->playlist()), &before, &after));
        commit_reversible_command ();
 }
 
+/** Trim the end of the selected regions to the position of the edit cursor */
 void
-Editor::unfreeze_route ()
+Editor::trim_region_to_loop ()
 {
-       if (clicked_audio_trackview == 0 || !clicked_audio_trackview->is_audio_track()) {
+       Location* loc = session->locations()->auto_loop_location();
+       if (!loc) {
                return;
        }
-       
-       clicked_audio_trackview->audio_track()->unfreeze ();
+       trim_region_to_location (*loc, _("trim to loop"));
 }
 
-void*
-Editor::_freeze_thread (void* arg)
+void
+Editor::trim_region_to_punch ()
 {
-       PBD::ThreadCreated (pthread_self(), X_("Freeze"));
-       return static_cast<Editor*>(arg)->freeze_thread ();
+       Location* loc = session->locations()->auto_punch_location();
+       if (!loc) {
+               return;
+       }
+       trim_region_to_location (*loc, _("trim to punch"));
 }
-
-void*
-Editor::freeze_thread ()
+void
+Editor::trim_region_to_location (const Location& loc, const char* str)
 {
-       clicked_audio_trackview->audio_track()->freeze (*current_interthread_info);
-       return 0;
-}
+       RegionSelection rs;
 
-gint
-Editor::freeze_progress_timeout (void *arg)
-{
-       interthread_progress_bar.set_fraction (current_interthread_info->progress/100);
-       return !(current_interthread_info->done || current_interthread_info->cancel);
+       get_regions_for_action (rs);
+
+       begin_reversible_command (str);
+
+       for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
+               RegionView* rv = (*x);
+
+               /* require region to span proposed trim */
+               switch (rv->region()->coverage (loc.start(), loc.end())) {
+               case OverlapInternal:
+                       break;
+               default:
+                       continue;
+               }
+                               
+               RouteTimeAxisView* tav = dynamic_cast<RouteTimeAxisView*> (&rv->get_time_axis_view());
+               if (!tav) {
+                       return;
+               }
+
+               float speed = 1.0;
+               nframes64_t start;
+               nframes64_t end;
+
+               if (tav->get_diskstream() != 0) {
+                       speed = tav->get_diskstream()->speed();
+               }
+               
+               start = session_frame_to_track_frame (loc.start(), speed);
+               end = session_frame_to_track_frame (loc.end(), speed);
+
+               XMLNode &before = rv->region()->playlist()->get_state();
+               rv->region()->trim_to (start, (end - start), this);
+               XMLNode &after = rv->region()->playlist()->get_state();
+               session->add_command(new MementoCommand<Playlist>(
+                               *(rv->region()->playlist()), &before, &after));
+       }
+
+       commit_reversible_command ();
 }
 
 void
-Editor::freeze_route ()
+Editor::trim_region_to_edit_point ()
 {
-       if (clicked_audio_trackview == 0 || !clicked_audio_trackview->is_audio_track()) {
-               return;
-       }
+       RegionSelection rs;
        
-       InterThreadInfo itt;
+       get_regions_for_action (rs);
 
-       if (interthread_progress_window == 0) {
-               build_interthread_progress_window ();
+       nframes64_t where = get_preferred_edit_position();
+
+       begin_reversible_command (_("trim region start to edit point"));
+
+       for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
+               RegionView* rv = (*x);
+
+               /* require region to cover trim */
+               if (!rv->region()->covers (where)) {
+                       continue;
+               }
+
+               RouteTimeAxisView* tav = dynamic_cast<RouteTimeAxisView*> (&rv->get_time_axis_view());
+               if (!tav) {
+                       return;
+               }
+
+               float speed = 1.0;
+
+               if (tav->get_diskstream() != 0) {
+                       speed = tav->get_diskstream()->speed();
+               }
+
+               XMLNode &before = rv->region()->playlist()->get_state();
+               rv->region()->trim_end( session_frame_to_track_frame(where, speed), this);
+               XMLNode &after = rv->region()->playlist()->get_state();
+               session->add_command(new MementoCommand<Playlist>(
+                               *(rv->region()->playlist()), &before, &after));
+       }
+               
+       commit_reversible_command ();
+}
+
+void
+Editor::trim_region_from_edit_point ()
+{
+       RegionSelection rs;
+
+       get_regions_for_action (rs);
+
+       nframes64_t where = get_preferred_edit_position();
+
+       begin_reversible_command (_("trim region end to edit point"));
+
+       for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
+               RegionView* rv = (*x);
+
+               /* require region to cover trim */
+               if (!rv->region()->covers (where)) {
+                       continue;
+               }
+
+               RouteTimeAxisView* tav = dynamic_cast<RouteTimeAxisView*> (&rv->get_time_axis_view());
+               if (!tav) {
+                       return;
+               }
+
+               float speed = 1.0;
+
+               if (tav->get_diskstream() != 0) {
+                       speed = tav->get_diskstream()->speed();
+               }
+
+               XMLNode &before = rv->region()->playlist()->get_state();
+               rv->region()->trim_front ( session_frame_to_track_frame(where, speed), this);
+               XMLNode &after = rv->region()->playlist()->get_state();
+               session->add_command(new MementoCommand<Playlist>(
+                               *(rv->region()->playlist()), &before, &after));
+       }
+               
+       commit_reversible_command ();
+}
+
+void
+Editor::trim_region_to_previous_region_end ()
+{
+       return trim_to_region(false);
+}
+
+void
+Editor::trim_region_to_next_region_start ()
+{
+       return trim_to_region(true);
+}
+
+void
+Editor::trim_to_region(bool forward)
+{
+       RegionSelection rs;
+
+       get_regions_for_action (rs);
+
+       begin_reversible_command (_("trim to region"));
+
+       boost::shared_ptr<Region> next_region;
+
+       for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
+
+               AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*x);
+
+               if (!arv) {
+                       continue;
+               }
+
+               AudioTimeAxisView* atav = dynamic_cast<AudioTimeAxisView*> (&arv->get_time_axis_view());
+
+               if (!atav) {
+                       return;
+               }
+
+               float speed = 1.0;
+
+               if (atav->get_diskstream() != 0) {
+                       speed = atav->get_diskstream()->speed();
+               }
+
+               
+               boost::shared_ptr<Region> region = arv->region();
+               boost::shared_ptr<Playlist> playlist (region->playlist());
+               
+               XMLNode &before = playlist->get_state();
+
+               if(forward){
+
+                   next_region = playlist->find_next_region (region->first_frame(), Start, 1);
+
+                   if(!next_region){
+                       continue;
+                   }
+
+                   region->trim_end((nframes64_t) (next_region->first_frame() * speed), this);
+                   arv->region_changed (Change (LengthChanged));
+               }
+               else {
+
+                   next_region = playlist->find_next_region (region->first_frame(), Start, 0);
+
+                   if(!next_region){
+                       continue;
+                   }
+
+                   region->trim_front((nframes64_t) ((next_region->last_frame() + 1) * speed), this);              
+                   arv->region_changed (Change (LengthChanged|PositionChanged|StartChanged));
+               }
+
+               XMLNode &after = playlist->get_state();
+               session->add_command(new MementoCommand<Playlist>(*playlist, &before, &after));
+       }
+
+       commit_reversible_command ();
+}
+
+void
+Editor::unfreeze_route ()
+{
+       if (clicked_routeview == 0 || !clicked_routeview->is_track()) {
+               return;
+       }
+       
+       clicked_routeview->track()->unfreeze ();
+}
+
+void*
+Editor::_freeze_thread (void* arg)
+{
+       PBD::notify_gui_about_thread_creation (pthread_self(), X_("Freeze"));
+       return static_cast<Editor*>(arg)->freeze_thread ();
+}
+
+void*
+Editor::freeze_thread ()
+{
+       clicked_routeview->audio_track()->freeze (*current_interthread_info);
+       current_interthread_info->done = true;
+       return 0;
+}
+
+gint
+Editor::freeze_progress_timeout (void */*arg*/)
+{
+       interthread_progress_bar.set_fraction (current_interthread_info->progress);
+       return !(current_interthread_info->done || current_interthread_info->cancel);
+}
+
+void
+Editor::freeze_route ()
+{
+       if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) {
+               return;
+       }
+       
+       InterThreadInfo itt;
+
+       if (interthread_progress_window == 0) {
+               build_interthread_progress_window ();
        }
 
        WindowTitle title(Glib::get_application_name());
@@ -2571,11 +3741,11 @@ Editor::freeze_route ()
        pthread_attr_init(&attr);
        pthread_attr_setstacksize(&attr, 500000);
 
-       pthread_create (&itt.thread, &attr, _freeze_thread, this);
+       pthread_create_and_store (X_("freezer"), &itt.thread, &attr, _freeze_thread, this);
 
        pthread_attr_destroy(&attr);
 
-       track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
+       track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
 
        while (!itt.done && !itt.cancel) {
                gtk_main_iteration ();
@@ -2584,11 +3754,11 @@ Editor::freeze_route ()
        interthread_progress_connection.disconnect ();
        interthread_progress_window->hide_all ();
        current_interthread_info = 0;
-       track_canvas.get_window()->set_cursor (*current_canvas_cursor);
+       track_canvas->get_window()->set_cursor (*current_canvas_cursor);
 }
 
 void
-Editor::bounce_range_selection ()
+Editor::bounce_range_selection (bool replace, bool enable_processing)
 {
        if (selection->time.empty()) {
                return;
@@ -2596,23 +3766,23 @@ Editor::bounce_range_selection ()
 
        TrackSelection views = selection->tracks;
 
-       nframes_t start = selection->time[clicked_selection].start;
-       nframes_t end = selection->time[clicked_selection].end;
-       nframes_t cnt = end - start + 1;
+       nframes64_t start = selection->time[clicked_selection].start;
+       nframes64_t end = selection->time[clicked_selection].end;
+       nframes64_t cnt = end - start + 1;
 
        begin_reversible_command (_("bounce range"));
 
        for (TrackViewList::iterator i = views.begin(); i != views.end(); ++i) {
 
-               AudioTimeAxisView* atv;
+               RouteTimeAxisView* rtv;
 
-               if ((atv = dynamic_cast<AudioTimeAxisView*> (*i)) == 0) {
+               if ((rtv = dynamic_cast<RouteTimeAxisView*> (*i)) == 0) {
                        continue;
                }
                
                boost::shared_ptr<Playlist> playlist;
                
-               if ((playlist = atv->playlist()) == 0) {
+               if ((playlist = rtv->playlist()) == 0) {
                        return;
                }
 
@@ -2623,7 +3793,15 @@ Editor::bounce_range_selection ()
                itt.progress = false;
 
                 XMLNode &before = playlist->get_state();
-               atv->audio_track()->bounce_range (start, cnt, itt);
+               boost::shared_ptr<Region> r = rtv->track()->bounce_range (start, start+cnt, itt, enable_processing);
+               
+               if (replace) {
+                       list<AudioRange> ranges;
+                       ranges.push_back (AudioRange (start, start+cnt, 0));
+                       playlist->cut (ranges); // discard result
+                       playlist->add_region (r, start);
+               }
+
                 XMLNode &after = playlist->get_state();
                session->add_command (new MementoCommand<Playlist> (*playlist, &before, &after));
        }
@@ -2631,18 +3809,50 @@ Editor::bounce_range_selection ()
        commit_reversible_command ();
 }
 
+/** Cut selected regions, automation points or a time range */
 void
 Editor::cut ()
 {
        cut_copy (Cut);
 }
 
+/** Copy selected regions, automation points or a time range */
 void
 Editor::copy ()
 {
        cut_copy (Copy);
 }
 
+
+/** @return true if a Cut, Copy or Clear is possible */
+bool
+Editor::can_cut_copy () const
+{
+       switch (current_mouse_mode()) {
+               
+       case MouseObject:
+               if (!selection->regions.empty() || !selection->points.empty()) {
+                       return true;
+               }
+               break;
+               
+       case MouseRange:
+               if (!selection->time.empty()) {
+                       return true;
+               }
+               break;
+               
+       default:
+               break;
+       }
+
+       return false;
+}
+
+
+/** Cut, copy or clear selected regions, automation points or a time range.
+ * @param op Operation (Cut, Copy or Clear)
+ */
 void 
 Editor::cut_copy (CutCopyOp op)
 {
@@ -2661,55 +3871,127 @@ Editor::cut_copy (CutCopyOp op)
                opname = _("clear");
                break;
        }
+
+       /* if we're deleting something, and the mouse is still pressed,
+          the thing we started a drag for will be gone when we release
+          the mouse button(s). avoid this. see part 2 at the end of
+          this function.
+       */
+
+       if (op == Cut || op == Clear) {
+               if (_drag) {
+                       _drag->item()->ungrab (0);
+                       delete _drag;
+                       _drag = 0;
+               }
+       }
        
        cut_buffer->clear ();
 
-       switch (current_mouse_mode()) {
-       case MouseObject: 
-               if (!selection->regions.empty() || !selection->points.empty()) {
+       if (entered_marker) {
 
-                       begin_reversible_command (opname + _(" objects"));
+               /* cut/delete op while pointing at a marker */
 
-                       if (!selection->regions.empty()) {
-                               
-                               cut_copy_regions (op);
+               bool ignored;
+               Location* loc = find_location_from_marker (entered_marker, ignored);
+
+               if (session && loc) {
+                       Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::really_remove_marker), loc));
+               }
+
+               break_drag ();
+               delete _drag;
+               _drag = 0;
+
+               return;
+       }
+
+       if (internal_editing()) {
+
+               switch (current_mouse_mode()) {
+               case MouseObject:
+               case MouseRange:
+                       cut_copy_midi (op);
+                       break;
+               default:
+                       break;
+               }
+       } else {
+               
+               RegionSelection rs; 
+               
+               /* we only want to cut regions if some are selected */
+               
+               if (!selection->regions.empty()) {
+                       get_regions_for_action (rs);
+               }
+               
+               switch (current_mouse_mode()) {
+               case MouseObject: 
+                       if (!rs.empty() || !selection->points.empty()) {
+
+                               begin_reversible_command (opname + _(" objects"));
+
+                               if (!rs.empty()) {
+                                       cut_copy_regions (op, rs);
                                
-                               if (op == Cut) {
-                                       selection->clear_regions ();
+                                       if (op == Cut) {
+                                               selection->clear_regions ();
+                                       }
                                }
-                       }
 
-                       if (!selection->points.empty()) {
-                               cut_copy_points (op);
+                               if (!selection->points.empty()) {
+                                       cut_copy_points (op);
 
-                               if (op == Cut) {
-                                       selection->clear_points ();
+                                       if (op == Cut) {
+                                               selection->clear_points ();
+                                       }
                                }
-                       }
 
-                       commit_reversible_command ();   
-               }
-               break;
+                               commit_reversible_command ();   
+                               break; // terminate case statement here
+                       } 
+                       if (!selection->time.empty()) {
+                               /* don't cause suprises */
+                               break;
+                       }
+                       // fall thru if there was nothing selected
                
-       case MouseRange:
-               if (!selection->time.empty()) {
-
+               case MouseRange:
+                       if (selection->time.empty()) {
+                               nframes64_t start, end;
+                               if (!get_edit_op_range (start, end)) {
+                                       return;
+                               }
+                               selection->set ((TimeAxisView*) 0, start, end);
+                       }
+                       
                        begin_reversible_command (opname + _(" range"));
                        cut_copy_ranges (op);
                        commit_reversible_command ();
-
+               
                        if (op == Cut) {
                                selection->clear_time ();
                        }
-                       
+
+                       break;
+               
+               default:
+                       break;
                }
-               break;
+       }
                
-       default:
-               break;
+       if (op == Cut || op == Clear) {
+               break_drag ();
+               delete _drag;
+               _drag = 0;
        }
 }
 
+/** Cut, copy or clear selected automation points.
+ * @param op Operation (Cut, Copy or Clear)
+ */
 void
 Editor::cut_copy_points (CutCopyOp op)
 {
@@ -2723,6 +4005,20 @@ Editor::cut_copy_points (CutCopyOp op)
        }
 }
 
+/** Cut, copy or clear selected automation points.
+ * @param op Operation (Cut, Copy or Clear)
+ */
+void
+Editor::cut_copy_midi (CutCopyOp op)
+{
+       cerr << "CCM: there are " << selection->midi.size() << " MRV's to work on\n";
+
+       for (MidiSelection::iterator i = selection->midi.begin(); i != selection->midi.end(); ++i) {
+               MidiRegionView* mrv = *i;
+               mrv->cut_copy_clear (op);
+       }
+}
+
 struct PlaylistState {
     boost::shared_ptr<Playlist> playlist;
     XMLNode*  before;
@@ -2736,67 +4032,170 @@ struct lt_playlist {
        
 struct PlaylistMapping { 
     TimeAxisView* tv;
-    boost::shared_ptr<AudioPlaylist> pl;
+    boost::shared_ptr<Playlist> pl;
 
     PlaylistMapping (TimeAxisView* tvp) : tv (tvp) {}
 };
 
+/** Remove `clicked_regionview' */
 void
-Editor::cut_copy_regions (CutCopyOp op)
+Editor::remove_clicked_region ()
 {
-       /* we can't use a std::map here because the ordering is important, and we can't trivially sort
-          a map when we want ordered access to both elements. i think.
-       */
-
-       vector<PlaylistMapping> pmap;
+       if (clicked_routeview == 0 || clicked_regionview == 0) {
+               return;
+       }
 
-       nframes_t first_position = max_frames;
-       
-       set<PlaylistState, lt_playlist> freezelist;
-       pair<set<PlaylistState, lt_playlist>::iterator,bool> insert_result;
+       boost::shared_ptr<Playlist> playlist = clicked_routeview->playlist();
        
-       /* get ordering correct before we cut/copy */
+       begin_reversible_command (_("remove region"));
+        XMLNode &before = playlist->get_state();
+       playlist->remove_region (clicked_regionview->region());
+        XMLNode &after = playlist->get_state();
+       session->add_command(new MementoCommand<Playlist>(*playlist, &before, &after));
+       commit_reversible_command ();
+}
+
+
+/** Remove the selected regions */
+void
+Editor::remove_selected_regions ()
+{
+       RegionSelection rs; 
+       get_regions_for_action (rs);
        
-       selection->regions.sort_by_position_and_track ();
+       if (!session) {
+               return;
+       }
 
-       for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) {
+       if (rs.empty()) {
+               return;
+       }
 
-               first_position = min ((*x)->region()->position(), first_position);
+       begin_reversible_command (_("remove region"));
 
-               if (op == Cut || op == Clear) {
-                       boost::shared_ptr<AudioPlaylist> pl = boost::dynamic_pointer_cast<AudioPlaylist>((*x)->region()->playlist());
+       list<boost::shared_ptr<Region> > regions_to_remove;
 
-                       if (pl) {
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+               // we can't just remove the region(s) in this loop because
+               // this removes them from the RegionSelection, and they thus
+               // disappear from underneath the iterator, and the ++i above
+               // SEGVs in a puzzling fashion.
 
-                               PlaylistState before;
-                               before.playlist = pl;
-                               before.before = &pl->get_state();
-                               
-                               insert_result = freezelist.insert (before);
-                               
-                               if (insert_result.second) {
-                                       pl->freeze ();
-                               }
-                       }
-               }
+               // so, first iterate over the regions to be removed from rs and
+               // add them to the regions_to_remove list, and then
+               // iterate over the list to actually remove them.
+               
+               regions_to_remove.push_back ((*i)->region());
+       }
 
-               TimeAxisView* tv = &(*x)->get_trackview();
-               vector<PlaylistMapping>::iterator z;
+       vector<PlaylistState> playlists;
+       
+       for (list<boost::shared_ptr<Region> >::iterator rl = regions_to_remove.begin(); rl != regions_to_remove.end(); ++rl) {
 
-               for (z = pmap.begin(); z != pmap.end(); ++z) {
-                       if ((*z).tv == tv) {
+               boost::shared_ptr<Playlist> playlist = (*rl)->playlist();
+
+               if (!playlist) {
+                       // is this check necessary?
+                       continue;
+               }
+
+               vector<PlaylistState>::iterator i;
+
+               //only take state if this is a new playlist.
+               for (i = playlists.begin(); i != playlists.end(); ++i) {
+                       if ((*i).playlist == playlist) {
                                break;
                        }
                }
-               
-               if (z == pmap.end()) {
-                       pmap.push_back (PlaylistMapping (tv));
-               }
+
+               if (i == playlists.end()) {
+
+                       PlaylistState before;
+                       before.playlist = playlist;
+                       before.before = &playlist->get_state();
+
+                       playlist->freeze ();
+                       playlists.push_back(before);
+               }
+
+               playlist->remove_region (*rl);          
+       }
+
+       vector<PlaylistState>::iterator pl;
+
+       for (pl = playlists.begin(); pl != playlists.end(); ++pl) {
+               (*pl).playlist->thaw ();
+               session->add_command(new MementoCommand<Playlist>(*(*pl).playlist, (*pl).before, &(*pl).playlist->get_state()));
+       }
+
+       commit_reversible_command ();
+}
+
+/** Cut, copy or clear selected regions.
+ * @param op Operation (Cut, Copy or Clear)
+ */
+void
+Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs)
+{
+       /* we can't use a std::map here because the ordering is important, and we can't trivially sort
+          a map when we want ordered access to both elements. i think.
+       */
+
+       vector<PlaylistMapping> pmap;
+
+       nframes64_t first_position = max_frames;
+       
+       set<PlaylistState, lt_playlist> freezelist;
+       pair<set<PlaylistState, lt_playlist>::iterator,bool> insert_result;
+       
+       /* get ordering correct before we cut/copy */
+       
+       rs.sort_by_position_and_track ();
+
+       for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
+
+               first_position = min ((nframes64_t) (*x)->region()->position(), first_position);
+
+               if (op == Cut || op == Clear) {
+                       boost::shared_ptr<Playlist> pl = (*x)->region()->playlist();
+
+                       if (pl) {
+                               set<PlaylistState, lt_playlist>::iterator fl;
+
+                               //only take state if this is a new playlist.
+                               for (fl = freezelist.begin(); fl != freezelist.end(); ++fl) {
+                                       if ((*fl).playlist == pl) {
+                                               break;
+                                       }
+                               }
+               
+                               if (fl == freezelist.end()) {
+                                       PlaylistState before;
+                                       before.playlist = pl;
+                                       before.before = &pl->get_state();
+                                       pl->freeze ();
+                                       insert_result = freezelist.insert (before);
+                               }
+                       }
+               }
+
+               TimeAxisView* tv = &(*x)->get_trackview();
+               vector<PlaylistMapping>::iterator z;
+
+               for (z = pmap.begin(); z != pmap.end(); ++z) {
+                       if ((*z).tv == tv) {
+                               break;
+                       }
+               }
+               
+               if (z == pmap.end()) {
+                       pmap.push_back (PlaylistMapping (tv));
+               }
        }
 
-       for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ) {
+       for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ) {
 
-               boost::shared_ptr<AudioPlaylist> pl = boost::dynamic_pointer_cast<AudioPlaylist>((*x)->region()->playlist());
+               boost::shared_ptr<Playlist> pl = (*x)->region()->playlist();
                
                if (!pl) {
                        /* impossible, but this handles it for the future */
@@ -2804,7 +4203,7 @@ Editor::cut_copy_regions (CutCopyOp op)
                }
 
                TimeAxisView& tv = (*x)->get_trackview();
-               boost::shared_ptr<AudioPlaylist> npl;
+               boost::shared_ptr<Playlist> npl;
                RegionSelection::iterator tmp;
                
                tmp = x;
@@ -2821,34 +4220,32 @@ Editor::cut_copy_regions (CutCopyOp op)
                assert (z != pmap.end());
                
                if (!(*z).pl) {
-                       npl = boost::dynamic_pointer_cast<AudioPlaylist> (PlaylistFactory::create (*session, "cutlist", true));
+                       npl = PlaylistFactory::create (pl->data_type(), *session, "cutlist", true);
                        npl->freeze();
                        (*z).pl = npl;
                } else {
                        npl = (*z).pl;
                }
                
-               boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>((*x)->region());
+               boost::shared_ptr<Region> r = (*x)->region();
                boost::shared_ptr<Region> _xx;
-               
+
+               assert (r != 0);
+
                switch (op) {
                case Cut:
-                       if (!ar) break;
-                       
-                       _xx = RegionFactory::create ((*x)->region());
-                       npl->add_region (_xx, (*x)->region()->position() - first_position);
-                       pl->remove_region (((*x)->region()));
+                       _xx = RegionFactory::create (r);
+                       npl->add_region (_xx, r->position() - first_position);
+                       pl->remove_region (r);
                        break;
                        
                case Copy:
-                       if (!ar) break;
-
                        /* copy region before adding, so we're not putting same object into two different playlists */
-                       npl->add_region (RegionFactory::create ((*x)->region()), (*x)->region()->position() - first_position);
+                       npl->add_region (RegionFactory::create (r), r->position() - first_position);
                        break;
                        
                case Clear:
-                       pl->remove_region (((*x)->region()));
+                       pl->remove_region (r);
                        break;
                }
 
@@ -2878,7 +4275,20 @@ Editor::cut_copy_regions (CutCopyOp op)
 void
 Editor::cut_copy_ranges (CutCopyOp op)
 {
-       for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
+       TrackSelection* ts;
+       TrackSelection entered;
+
+       if (selection->tracks.empty()) {
+               if (!entered_track) {
+                       return;
+               }
+               entered.push_back (entered_track);
+               ts = &entered;
+       } else {
+               ts = &selection->tracks;
+       }
+
+       for (TrackSelection::iterator i = ts->begin(); i != ts->end(); ++i) {
                (*i)->cut_copy_clear (*selection, op);
        }
 }
@@ -2886,53 +4296,52 @@ Editor::cut_copy_ranges (CutCopyOp op)
 void
 Editor::paste (float times)
 {
-       paste_internal (edit_cursor->current_frame, times);
+       paste_internal (get_preferred_edit_position(), times);
 }
 
 void
 Editor::mouse_paste ()
 {
-       int x, y;
-       double wx, wy;
+       nframes64_t where;
+       bool ignored;
 
-       track_canvas.get_pointer (x, y);
-       track_canvas.window_to_world (x, y, wx, wy);
-       wx += horizontal_adjustment.get_value();
-       wy += vertical_adjustment.get_value();
+       if (!mouse_frame (where, ignored)) {
+               return;
+       }
 
-       GdkEvent event;
-       event.type = GDK_BUTTON_RELEASE;
-       event.button.x = wx;
-       event.button.y = wy;
-       
-       nframes_t where = event_frame (&event, 0, 0);
        snap_to (where);
        paste_internal (where, 1);
 }
 
 void
-Editor::paste_internal (nframes_t position, float times)
+Editor::paste_internal (nframes64_t position, float times)
 {
        bool commit = false;
 
-       if (cut_buffer->empty() || selection->tracks.empty()) {
+       if (cut_buffer->empty()) {
                return;
        }
 
        if (position == max_frames) {
-               position = edit_cursor->current_frame;
+               position = get_preferred_edit_position();
        }
 
        begin_reversible_command (_("paste"));
 
+       TrackSelection ts;
        TrackSelection::iterator i;
        size_t nth;
 
        /* get everything in the correct order */
 
-       sort_track_selection ();
+       if (!selection->tracks.empty()) {
+               sort_track_selection ();
+               ts = selection->tracks;
+       } else if (entered_track) {
+               ts.push_back (entered_track);
+       }
 
-       for (nth = 0, i = selection->tracks.begin(); i != selection->tracks.end(); ++i, ++nth) {
+       for (nth = 0, i = ts.begin(); i != ts.end(); ++i, ++nth) {
 
                /* undo/redo is handled by individual tracks */
 
@@ -2971,15 +4380,15 @@ Editor::paste_named_selection (float times)
 
        for (t = selection->tracks.begin(); t != selection->tracks.end(); ++t) {
                
-               AudioTimeAxisView* atv;
+               RouteTimeAxisView* rtv;
                boost::shared_ptr<Playlist> pl;
                boost::shared_ptr<AudioPlaylist> apl;
 
-               if ((atv = dynamic_cast<AudioTimeAxisView*> (*t)) == 0) {
+               if ((rtv = dynamic_cast<RouteTimeAxisView*> (*t)) == 0) {
                        continue;
                }
 
-               if ((pl = atv->playlist()) == 0) {
+               if ((pl = rtv->playlist()) == 0) {
                        continue;
                }
                
@@ -2990,8 +4399,8 @@ Editor::paste_named_selection (float times)
                tmp = chunk;
                ++tmp;
 
-                XMLNode &before = apl->get_state();
-               apl->paste (*chunk, edit_cursor->current_frame, times);
+               XMLNode &before = apl->get_state();
+               apl->paste (*chunk, get_preferred_edit_position(), times);
                session->add_command(new MementoCommand<AudioPlaylist>(*apl, &before, &apl->get_state()));
 
                if (tmp != ns->playlists.end()) {
@@ -3006,8 +4415,9 @@ void
 Editor::duplicate_some_regions (RegionSelection& regions, float times)
 {
        boost::shared_ptr<Playlist> playlist; 
-       RegionSelection sel = regions; // clear (below) will clear the argument list
-               
+       RegionSelection sel = regions; // clear (below) may  clear the argument list if its the current region selection
+       RegionSelection foo;
+
        begin_reversible_command (_("duplicate region"));
 
        selection->clear_regions ();
@@ -3017,8 +4427,9 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times)
                boost::shared_ptr<Region> r ((*i)->region());
 
                TimeAxisView& tv = (*i)->get_time_axis_view();
-               AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (&tv);
-               sigc::connection c = atv->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
+               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&tv);
+               latest_regionviews.clear ();
+               sigc::connection c = rtv->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
                
                playlist = (*i)->region()->playlist();
                 XMLNode &before = playlist->get_state();
@@ -3026,14 +4437,15 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times)
                session->add_command(new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
 
                c.disconnect ();
-
-               if (latest_regionview) {
-                       selection->add (latest_regionview);
-               }
-       }
                
+               foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end());
+       }
 
        commit_reversible_command ();
+
+       if (!foo.empty()) {
+               selection->set (foo);
+       }
 }
 
 void
@@ -3044,8 +4456,8 @@ Editor::duplicate_selection (float times)
        }
 
        boost::shared_ptr<Playlist> playlist; 
-       vector<boost::shared_ptr<AudioRegion> > new_regions;
-       vector<boost::shared_ptr<AudioRegion> >::iterator ri;
+       vector<boost::shared_ptr<Region> > new_regions;
+       vector<boost::shared_ptr<Region> >::iterator ri;
                
        create_region_from_selection (new_regions);
 
@@ -3061,9 +4473,9 @@ Editor::duplicate_selection (float times)
                if ((playlist = (*i)->playlist()) == 0) {
                        continue;
                }
-                XMLNode &before = playlist->get_state();
+               XMLNode &before = playlist->get_state();
                playlist->duplicate (*ri, selection->time[clicked_selection].end, times);
-                XMLNode &after = playlist->get_state();
+               XMLNode &after = playlist->get_state();
                session->add_command (new MementoCommand<Playlist>(*playlist, &before, &after));
 
                ++ri;
@@ -3093,17 +4505,15 @@ Editor::reset_point_selection ()
 void
 Editor::center_playhead ()
 {
-       float page = canvas_width * frames_per_unit;
-
+       float page = _canvas_width * frames_per_unit;
        center_screen_internal (playhead_cursor->current_frame, page);
 }
 
 void
-Editor::center_edit_cursor ()
+Editor::center_edit_point ()
 {
-       float page = canvas_width * frames_per_unit;
-
-       center_screen_internal (edit_cursor->current_frame, page);
+       float page = _canvas_width * frames_per_unit;
+       center_screen_internal (get_preferred_edit_position(), page);
 }
 
 void
@@ -3118,15 +4528,15 @@ Editor::clear_playlist (boost::shared_ptr<Playlist> playlist)
 }
 
 void
-Editor::nudge_track (bool use_edit_cursor, bool forwards)
+Editor::nudge_track (bool use_edit, bool forwards)
 {
        boost::shared_ptr<Playlist> playlist; 
-       nframes_t distance;
-       nframes_t next_distance;
-       nframes_t start;
+       nframes64_t distance;
+       nframes64_t next_distance;
+       nframes64_t start;
 
-       if (use_edit_cursor) {
-               start = edit_cursor->current_frame;
+       if (use_edit) {
+               start = get_preferred_edit_position();
        } else {
                start = 0;
        }
@@ -3191,26 +4601,50 @@ Editor::normalize_region ()
                return;
        }
 
-       if (selection->regions.empty()) {
+       RegionSelection rs; 
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
+               return;
+       }
+       
+       Dialog dialog (rs.size() > 1 ? _("Normalize regions") : _("Normalize region"));
+       HBox hbox;
+       hbox.pack_start (*manage (new Label (_("Normalize to:"))));
+       SpinButton spin (0.2, 2);
+       spin.set_range (-112, 0);
+       spin.set_increments (0.1, 1);
+       spin.set_value (0);
+       hbox.pack_start (spin);
+       spin.set_value (_last_normalization_value);
+       hbox.pack_start (*manage (new Label (_("dbFS"))));
+       hbox.show_all ();
+       dialog.get_vbox()->pack_start (hbox);
+       dialog.add_button (Stock::CANCEL, RESPONSE_CANCEL);
+       dialog.add_button (_("Normalize"), RESPONSE_ACCEPT);
+
+       if (dialog.run () == RESPONSE_CANCEL) {
                return;
        }
 
        begin_reversible_command (_("normalize"));
 
-       track_canvas.get_window()->set_cursor (*wait_cursor);
+       track_canvas->get_window()->set_cursor (*wait_cursor);
        gdk_flush ();
 
-       for (RegionSelection::iterator r = selection->regions.begin(); r != selection->regions.end(); ++r) {
+       for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
                AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*r);
                if (!arv)
                        continue;
                XMLNode &before = arv->region()->get_state();
-               arv->audio_region()->normalize_to (0.0f);
+               arv->audio_region()->normalize_to (spin.get_value());
                session->add_command (new MementoCommand<Region>(*(arv->region().get()), &before, &arv->region()->get_state()));
        }
 
        commit_reversible_command ();
-       track_canvas.get_window()->set_cursor (*current_canvas_cursor);
+       track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+
+       _last_normalization_value = spin.get_value ();
 }
 
 
@@ -3221,13 +4655,17 @@ Editor::denormalize_region ()
                return;
        }
 
-       if (selection->regions.empty()) {
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
                return;
        }
 
        begin_reversible_command ("denormalize");
 
-       for (RegionSelection::iterator r = selection->regions.begin(); r != selection->regions.end(); ++r) {
+       for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
                AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*r);
                if (!arv)
                        continue;
@@ -3239,6 +4677,58 @@ Editor::denormalize_region ()
        commit_reversible_command ();
 }
 
+void
+Editor::adjust_region_scale_amplitude (bool up)
+{
+       if (!session) {
+               return;
+       }
+
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
+               return;
+       }
+
+       begin_reversible_command ("denormalize");
+
+       for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
+               AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*r);
+               if (!arv)
+                       continue;
+               XMLNode &before = arv->region()->get_state();
+               
+               double fraction = gain_to_slider_position (arv->audio_region()->scale_amplitude ());
+               
+               if (up) {
+                       fraction += 0.05;
+                       fraction = min (fraction, 1.0);
+               } else {
+                       fraction -= 0.05;
+                       fraction = max (fraction, 0.0);
+               }
+
+               if (!up && fraction <= 0) {
+                       continue;
+               }
+
+               fraction = slider_position_to_gain (fraction);
+               fraction = coefficient_to_dB (fraction);
+               fraction = dB_to_coefficient (fraction);
+
+               if (up && fraction >= 2.0) {
+                       continue;
+               }
+               
+               arv->audio_region()->set_scale_amplitude (fraction);
+               session->add_command (new MementoCommand<Region>(*(arv->region().get()), &before, &arv->region()->get_state()));
+       }
+
+       commit_reversible_command ();
+}
+
 
 void
 Editor::reverse_region ()
@@ -3252,47 +4742,121 @@ Editor::reverse_region ()
 }
 
 void
-Editor::apply_filter (AudioFilter& filter, string command)
+Editor::strip_region_silence ()
+{
+       if (!session) {
+               return;
+       }
+
+       RegionSelection rs;
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
+               return;
+       }
+
+       std::list<boost::shared_ptr<AudioRegion> > ar;
+       
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+               AudioRegionView* const arv = dynamic_cast<AudioRegionView*> (*i);
+               if (arv) {
+                       ar.push_back (arv->audio_region ());
+               }
+       }
+       
+       StripSilenceDialog d (ar);
+       int const r = d.run ();
+
+       if (r == Gtk::RESPONSE_OK) {
+               StripSilence s (*session, d.threshold (), d.minimum_length (), d.fade_length ());
+               apply_filter (s, _("strip silence"));
+       }
+}
+
+
+void
+Editor::quantize_region ()
+{
+       if (!session) {
+               return;
+       }
+
+       // FIXME: varying meter?
+       Quantize quant (*session, snap_length_beats(0));
+       apply_filter (quant, _("quantize regions"));
+}
+
+void
+Editor::apply_filter (Filter& filter, string command)
 {
-       if (selection->regions.empty()) {
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
                return;
        }
 
        begin_reversible_command (command);
 
-       track_canvas.get_window()->set_cursor (*wait_cursor);
+       track_canvas->get_window()->set_cursor (*wait_cursor);
        gdk_flush ();
 
-       for (RegionSelection::iterator r = selection->regions.begin(); r != selection->regions.end(); ) {
+       for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) {
+               RegionSelection::iterator tmp = r;
+               ++tmp;
+
+               MidiRegionView* const mrv = dynamic_cast<MidiRegionView*>(*r);
+               if (mrv) {
+                       if (mrv->midi_region()->apply(filter) == 0) {
+                               mrv->redisplay_model();
+                       }
+               }
+
                AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*r);
-               if (!arv)
-                       continue;
+               if (arv) {
+                       boost::shared_ptr<Playlist> playlist = arv->region()->playlist();
 
-               boost::shared_ptr<Playlist> playlist = arv->region()->playlist();
+                       if (arv->audio_region()->apply (filter) == 0) {
 
-               RegionSelection::iterator tmp;
-               
-               tmp = r;
-               ++tmp;
+                               XMLNode &before = playlist->get_state();
 
-               if (arv->audio_region()->apply (filter) == 0) {
+                               if (filter.results.empty ()) {
 
-                        XMLNode &before = playlist->get_state();
-                       playlist->replace_region (arv->region(), filter.results.front(), arv->region()->position());
-                        XMLNode &after = playlist->get_state();
-                       session->add_command(new MementoCommand<Playlist>(*playlist, &before, &after));
-               } else {
-                       goto out;
+                                       /* no regions returned; remove the old one */
+                                       playlist->remove_region (arv->region ());
+                                       
+                               } else {
+
+                                       std::vector<boost::shared_ptr<Region> >::iterator res = filter.results.begin ();
+
+                                       /* first region replaces the old one */
+                                       playlist->replace_region (arv->region(), *res, (*res)->position());
+                                       ++res;
+
+                                       /* add the rest */
+                                       while (res != filter.results.end()) {
+                                               playlist->add_region (*res, (*res)->position());
+                                               ++res;
+                                       }
+                                       
+                               }
+
+                               XMLNode &after = playlist->get_state();
+                               session->add_command(new MementoCommand<Playlist>(*playlist, &before, &after));
+                       } else {
+                               goto out;
+                       }
                }
 
                r = tmp;
        }
 
        commit_reversible_command ();
-       selection->regions.clear ();
+       rs.clear ();
 
   out:
-       track_canvas.get_window()->set_cursor (*current_canvas_cursor);
+       track_canvas->get_window()->set_cursor (*current_canvas_cursor);
 }
 
 void
@@ -3326,30 +4890,24 @@ Editor::region_selection_op (void (Region::*pmf)(bool), bool yn)
 void
 Editor::external_edit_region ()
 {
-       if (!clicked_regionview) {
-               return;
-       }
-
        /* more to come */
 }
 
 void
-Editor::brush (nframes_t pos)
+Editor::brush (nframes64_t pos)
 {
        RegionSelection sel;
-       snap_to (pos);
+       RegionSelection rs; 
 
-       if (selection->regions.empty()) {
-               /* XXX get selection from region list */
-       } else { 
-               sel = selection->regions;
-       }
+       get_regions_for_action (rs);
+
+       snap_to (pos);
 
-       if (sel.empty()) {
+       if (rs.empty()) {
                return;
        }
 
-       for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
                mouse_brush_insert_region ((*i), pos);
        }
 }
@@ -3357,20 +4915,22 @@ Editor::brush (nframes_t pos)
 void
 Editor::reset_region_gain_envelopes ()
 {
-       if (!session || selection->regions.empty()) {
+       RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit);
+
+       if (!session || rs.empty()) {
                return;
        }
 
        session->begin_reversible_command (_("reset region gain"));
 
-       for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
                AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
                if (arv) {
-                       AutomationList& alist (arv->audio_region()->envelope());
-                       XMLNode& before (alist.get_state());
+                       boost::shared_ptr<AutomationList> alist (arv->audio_region()->envelope());
+                       XMLNode& before (alist->get_state());
 
                        arv->audio_region()->set_default_envelope ();
-                       session->add_command (new MementoCommand<AutomationList>(arv->audio_region()->envelope(), &before, &alist.get_state()));
+                       session->add_command (new MementoCommand<AutomationList>(*arv->audio_region()->envelope().get(), &before, &alist->get_state()));
                }
        }
 
@@ -3380,116 +4940,341 @@ Editor::reset_region_gain_envelopes ()
 void
 Editor::toggle_gain_envelope_visibility ()
 {
-       for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+       RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit);
+
+       if (!session || rs.empty()) {
+               return;
+       }
+
+       session->begin_reversible_command (_("region gain envelope visible"));
+
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
                AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
                if (arv) {
-                       bool x = region_envelope_visible_item->get_active();
-                       if (x != arv->envelope_visible()) {
-                               arv->set_envelope_visible (x);
-                       }
+                       XMLNode &before = arv->region()->get_state ();
+                       arv->set_envelope_visible (!arv->envelope_visible());
+                       XMLNode &after = arv->region()->get_state ();
+                       session->add_command (new MementoCommand<Region> (*(arv->region().get()), &before, &after));
                }
        }
+
+       session->commit_reversible_command ();
 }
 
 void
 Editor::toggle_gain_envelope_active ()
 {
-       for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+       RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit);
+
+       if (!session || rs.empty()) {
+               return;
+       }
+       
+       session->begin_reversible_command (_("region gain envelope active"));
+
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
                AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
                if (arv) {
-                       bool x = region_envelope_active_item->get_active();
-                       if (x != arv->audio_region()->envelope_active()) {
-                               arv->audio_region()->set_envelope_active (x);
-                       }
+                       XMLNode &before = arv->region()->get_state ();
+                       arv->audio_region()->set_envelope_active (!arv->audio_region()->envelope_active());
+                       XMLNode &after = arv->region()->get_state ();
+                       session->add_command (new MementoCommand<Region> (*(arv->region().get()), &before, &after));
                }
        }
+
+       session->commit_reversible_command ();
 }
 
 void
 Editor::toggle_region_lock ()
 {
-       for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
-               AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
-               if (arv) {
-                       bool x = region_lock_item->get_active();
-                       if (x != arv->audio_region()->locked()) {
-                               arv->audio_region()->set_locked (x);
-                       }
-               }
+       RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit);
+
+       if (!session || rs.empty()) {
+               return;
        }
-}
+       
+       session->begin_reversible_command (_("region lock"));
 
-void
-Editor::toggle_region_mute ()
-{
-       for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
-               AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
-               if (arv) {
-                       bool x = region_mute_item->get_active();
-                       if (x != arv->audio_region()->muted()) {
-                               arv->audio_region()->set_muted (x);
-                       }
-               }
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+               XMLNode &before = (*i)->region()->get_state ();
+               (*i)->region()->set_locked (!(*i)->region()->locked());
+               XMLNode &after = (*i)->region()->get_state ();
+               session->add_command (new MementoCommand<Region> (*((*i)->region().get()), &before, &after));
        }
+
+       session->commit_reversible_command ();
 }
 
 void
-Editor::toggle_region_opaque ()
+Editor::set_region_lock_style (Region::PositionLockStyle ps)
 {
-       for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
-               AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
-               if (arv) {
-                       bool x = region_opaque_item->get_active();
-                       if (x != arv->audio_region()->opaque()) {
-                               arv->audio_region()->set_opaque (x);
-                       }
-               }
+       RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit);
+
+       if (!session || rs.empty()) {
+               return;
+       }
+       
+       session->begin_reversible_command (_("region lock style"));
+
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+               XMLNode &before = (*i)->region()->get_state ();
+               (*i)->region()->set_position_lock_style (ps);
+               XMLNode &after = (*i)->region()->get_state ();
+               session->add_command (new MementoCommand<Region> (*((*i)->region().get()), &before, &after));
        }
+
+       session->commit_reversible_command ();
 }
 
+
 void
-Editor::set_fade_in_shape (AudioRegion::FadeShape shape)
+Editor::toggle_region_mute ()
 {
-       begin_reversible_command (_("set fade in shape"));
-
-       for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) {
-               AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
+       RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit);
+
+       if (!session || rs.empty()) {
+               return;
+       }
+       
+       session->begin_reversible_command (_("region mute"));
+
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+               XMLNode &before = (*i)->region()->get_state ();
+               (*i)->region()->set_muted (!(*i)->region()->muted());
+               XMLNode &after = (*i)->region()->get_state ();
+               session->add_command (new MementoCommand<Region> (*((*i)->region().get()), &before, &after));
+       }
+
+       session->commit_reversible_command ();
+}
+
+void
+Editor::toggle_region_opaque ()
+{
+       RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit);
+
+       if (!session || rs.empty()) {
+               return;
+       }
+       
+       session->begin_reversible_command (_("region opacity"));
+
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+               XMLNode &before = (*i)->region()->get_state ();
+               (*i)->region()->set_opaque (!(*i)->region()->opaque());
+               XMLNode &after = (*i)->region()->get_state ();
+               session->add_command (new MementoCommand<Region> (*((*i)->region().get()), &before, &after));
+       }
+
+       session->commit_reversible_command ();
+}
+
+void
+Editor::toggle_record_enable ()
+{
+       bool new_state = false;
+       bool first = true;
+       for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
+               RouteTimeAxisView *rtav = dynamic_cast<RouteTimeAxisView *>(*i);
+               if (!rtav)
+                       continue;
+               if (!rtav->is_track())
+                       continue;
+
+               if (first) {
+                       new_state = !rtav->track()->record_enabled();
+                       first = false;
+               }
+
+               rtav->track()->set_record_enable(new_state, this);
+       }
+}
+
+
+void
+Editor::set_fade_length (bool in)
+{
+       RegionSelection rs; 
+
+       get_regions_for_action (rs, true);
+
+       if (rs.empty()) {
+               return;
+       }
+
+       /* we need a region to measure the offset from the start */
+
+       RegionView* rv = rs.front ();
+
+       nframes64_t pos = get_preferred_edit_position();
+       nframes64_t len;
+       char* cmd;
+       
+       if (pos > rv->region()->last_frame() || pos < rv->region()->first_frame()) {
+               /* edit point is outside the relevant region */
+               return;
+       }
+
+       if (in) {
+               if (pos <= rv->region()->position()) {
+                       /* can't do it */
+                       return;
+               }
+               len = pos - rv->region()->position();
+               cmd = _("set fade in length");
+       } else {
+               if (pos >= rv->region()->last_frame()) {
+                       /* can't do it */
+                       return;
+               }
+               len = rv->region()->last_frame() - pos;
+               cmd = _("set fade out length");
+       }
+
+       begin_reversible_command (cmd);
+
+       for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
+               AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
+
+               if (!tmp) {
+                       return;
+               }
+
+               boost::shared_ptr<AutomationList> alist;
+               if (in) {
+                       alist = tmp->audio_region()->fade_in();
+               } else {
+                       alist = tmp->audio_region()->fade_out();
+               }
+
+               XMLNode &before = alist->get_state();
+
+               if (in) {
+                       tmp->audio_region()->set_fade_in_length (len);
+                       tmp->audio_region()->set_fade_in_active (true);
+               } else {
+                       tmp->audio_region()->set_fade_out_length (len);
+                       tmp->audio_region()->set_fade_out_active (true);
+               }
+               
+               XMLNode &after = alist->get_state();
+               session->add_command(new MementoCommand<AutomationList>(*alist, &before, &after));
+       }
+
+       commit_reversible_command ();
+}
+
+void
+Editor::toggle_fade_active (bool in)
+{
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
+               return;
+       }
+
+       const char* cmd = (in ? _("toggle fade in active") : _("toggle fade out active"));
+       bool have_switch = false;
+       bool yn = false;
+
+       begin_reversible_command (cmd);
+
+       for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
+               AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
+               
+               if (!tmp) {
+                       return;
+               }
+
+               boost::shared_ptr<AudioRegion> region (tmp->audio_region());
+
+               /* make the behaviour consistent across all regions */
+               
+               if (!have_switch) {
+                       if (in) {
+                               yn = region->fade_in_active();
+                       } else {
+                               yn = region->fade_out_active();
+                       }
+                       have_switch = true;
+               }
+
+               XMLNode &before = region->get_state();
+               if (in) {
+                       region->set_fade_in_active (!yn);
+               } else {
+                       region->set_fade_out_active (!yn);
+               }
+               XMLNode &after = region->get_state();
+               session->add_command(new MementoCommand<AudioRegion>(*region.get(), &before, &after));
+       }
+
+       commit_reversible_command ();
+}
+
+void
+Editor::set_fade_in_shape (AudioRegion::FadeShape shape)
+{
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
+               return;
+       }
+
+       begin_reversible_command (_("set fade in shape"));
+
+       for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
+               AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
 
                if (!tmp) {
                        return;
                }
 
-               AutomationList& alist = tmp->audio_region()->fade_in();
-               XMLNode &before = alist.get_state();
+               boost::shared_ptr<AutomationList> alist = tmp->audio_region()->fade_in();
+               XMLNode &before = alist->get_state();
 
                tmp->audio_region()->set_fade_in_shape (shape);
                
-               XMLNode &after = alist.get_state();
-               session->add_command(new MementoCommand<AutomationList>(alist, &before, &after));
+               XMLNode &after = alist->get_state();
+               session->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &after));
        }
 
        commit_reversible_command ();
+               
 }
 
 void
 Editor::set_fade_out_shape (AudioRegion::FadeShape shape)
 {
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
+               return;
+       }
+
        begin_reversible_command (_("set fade out shape"));
 
-       for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) {
+       for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
                AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
 
                if (!tmp) {
                        return;
                }
 
-               AutomationList& alist = tmp->audio_region()->fade_out();
-               XMLNode &before = alist.get_state();
+               boost::shared_ptr<AutomationList> alist = tmp->audio_region()->fade_out();
+               XMLNode &before = alist->get_state();
 
                tmp->audio_region()->set_fade_out_shape (shape);
                
-               XMLNode &after = alist.get_state();
-               session->add_command(new MementoCommand<AutomationList>(alist, &before, &after));
+               XMLNode &after = alist->get_state();
+               session->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &after));
        }
 
        commit_reversible_command ();
@@ -3498,9 +5283,17 @@ Editor::set_fade_out_shape (AudioRegion::FadeShape shape)
 void
 Editor::set_fade_in_active (bool yn)
 {
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
+               return;
+       }
+
        begin_reversible_command (_("set fade in active"));
 
-       for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) {
+       for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
                AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
 
                if (!tmp) {
@@ -3517,14 +5310,24 @@ Editor::set_fade_in_active (bool yn)
                XMLNode &after = ar->get_state();
                session->add_command(new MementoCommand<AudioRegion>(*ar, &before, &after));
        }
+
+       commit_reversible_command ();
 }
 
 void
 Editor::set_fade_out_active (bool yn)
 {
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
+               return;
+       }
+
        begin_reversible_command (_("set fade out active"));
 
-       for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) {
+       for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
                AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
 
                if (!tmp) {
@@ -3540,5 +5343,1199 @@ Editor::set_fade_out_active (bool yn)
                XMLNode &after = ar->get_state();
                session->add_command(new MementoCommand<AudioRegion>(*ar, &before, &after));
        }
+
+       commit_reversible_command ();
+}
+
+void
+Editor::toggle_selected_region_fades (int dir)
+{
+       RegionSelection rs;
+       RegionSelection::iterator i;
+       boost::shared_ptr<AudioRegion> ar;
+       bool yn;
+
+       get_regions_for_action (rs);
+       
+       if (rs.empty()) {
+               return;
+       }
+
+       for (i = rs.begin(); i != rs.end(); ++i) {
+               if ((ar = boost::dynamic_pointer_cast<AudioRegion>((*i)->region())) != 0) {
+                       if (dir == -1) {
+                               yn = ar->fade_out_active ();
+                       } else {
+                               yn = ar->fade_in_active ();
+                       }
+                       break;
+               }
+       }
+
+       if (i == rs.end()) {
+               return;
+       }
+
+       /* XXX should this undo-able? */
+
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+               if ((ar = boost::dynamic_pointer_cast<AudioRegion>((*i)->region())) == 0) {
+                       continue;
+               }
+               if (dir == 1 || dir == 0) {
+                       ar->set_fade_in_active (!yn);
+               }
+
+               if (dir == -1 || dir == 0) {
+                       ar->set_fade_out_active (!yn);
+               }
+       }
+}
+
+
+/** Update region fade visibility after its configuration has been changed */
+void
+Editor::update_region_fade_visibility ()
+{
+       bool _fade_visibility = session->config.get_show_region_fades ();
+
+       for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+               AudioTimeAxisView* v = dynamic_cast<AudioTimeAxisView*>(*i);
+               if (v) {
+                       if (_fade_visibility) {
+                               v->audio_view()->show_all_fades ();
+                       } else {
+                               v->audio_view()->hide_all_fades ();
+                       }
+               }
+       }
+}
+
+/** Update crossfade visibility after its configuration has been changed */
+void
+Editor::update_xfade_visibility ()
+{
+       _xfade_visibility = session->config.get_xfades_visible ();
+       
+       for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+               AudioTimeAxisView* v = dynamic_cast<AudioTimeAxisView*>(*i);
+               if (v) {
+                       if (_xfade_visibility) {
+                               v->show_all_xfades ();
+                       } else {
+                               v->hide_all_xfades ();
+                       }
+               }
+       }
+}
+
+void
+Editor::set_edit_point ()
+{
+       nframes64_t where;
+       bool ignored;
+
+       if (!mouse_frame (where, ignored)) {
+               return;
+       }
+       
+       snap_to (where);
+
+       if (selection->markers.empty()) {
+               
+               mouse_add_new_marker (where);
+
+       } else {
+               bool ignored;
+
+               Location* loc = find_location_from_marker (selection->markers.front(), ignored);
+
+               if (loc) {
+                       loc->move_to (where);
+               }
+       }
+}
+
+void
+Editor::set_playhead_cursor ()
+{
+       if (entered_marker) {
+               session->request_locate (entered_marker->position(), session->transport_rolling());
+       } else {
+               nframes64_t where;
+               bool ignored;
+
+               if (!mouse_frame (where, ignored)) {
+                       return;
+               }
+                       
+               snap_to (where);
+               
+               if (session) {
+                       session->request_locate (where, session->transport_rolling());
+               }
+       }
+}
+
+void
+Editor::split ()
+{
+       RegionSelection rs; 
+       
+       get_regions_for_action (rs, true);
+
+       nframes64_t where = get_preferred_edit_position();
+
+       if (rs.empty()) {
+               return;
+       }
+
+       split_regions_at (where, rs);
+}
+
+void
+Editor::ensure_entered_track_selected (bool op_really_wants_one_track_if_none_are_selected)
+{
+       if (entered_track && mouse_mode == MouseObject) {
+               if (!selection->tracks.empty()) {
+                       if (!selection->selected (entered_track)) {
+                               selection->add (entered_track);
+                       }
+               } else {
+                       /* there is no selection, but this operation requires/prefers selected objects */
+
+                       if (op_really_wants_one_track_if_none_are_selected) {
+                               selection->set (entered_track);
+                       }
+               }
+       }
+}
+
+struct EditorOrderRouteSorter {
+    bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
+           /* use of ">" forces the correct sort order */
+           return a->order_key ("editor") < b->order_key ("editor");
+    }
+};
+
+void
+Editor::select_next_route()
+{
+       if (selection->tracks.empty()) {
+               selection->set (track_views.front());
+               return;
+       }
+
+       TimeAxisView* current = selection->tracks.front();
+
+       RouteUI *rui;
+       do {
+               for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+                       if (*i == current) {
+                               ++i;
+                               if (i != track_views.end()) {
+                                       current = (*i);
+                               } else {
+                                       current = (*(track_views.begin()));
+                                       //selection->set (*(track_views.begin()));
+                               }
+                               break;
+                       }
+               }
+               rui = dynamic_cast<RouteUI *>(current);
+       } while ( current->hidden() || (rui != NULL && !rui->route()->active()));
+
+       selection->set(current);
+
+       ensure_track_visible(current);
+}
+
+void
+Editor::select_prev_route()
+{
+       if (selection->tracks.empty()) {
+               selection->set (track_views.front());
+               return;
+       }
+
+       TimeAxisView* current = selection->tracks.front();
+
+       RouteUI *rui;
+       do {
+               for (TrackViewList::reverse_iterator i = track_views.rbegin(); i != track_views.rend(); ++i) {
+                       if (*i == current) {
+                               ++i;
+                               if (i != track_views.rend()) {
+                                       current = (*i);
+                               } else {
+                                       current = *(track_views.rbegin());
+                               }
+                               break;
+                       }
+               }
+               rui = dynamic_cast<RouteUI *>(current);
+       } while ( current->hidden() || (rui != NULL && !rui->route()->active()));
+
+       selection->set (current);
+
+       ensure_track_visible(current);
+}
+
+void
+Editor::ensure_track_visible(TimeAxisView *track)
+{
+       if (track->hidden())
+               return;
+
+       double const current_view_min_y = vertical_adjustment.get_value();
+       double const current_view_max_y = vertical_adjustment.get_value() + vertical_adjustment.get_page_size() - canvas_timebars_vsize;
+
+       double const track_min_y = track->y_position ();
+       double const track_max_y = track->y_position () + track->effective_height ();
+
+       if (track_min_y >= current_view_min_y &&
+            track_max_y <= current_view_max_y) {
+               return;
+       }
+
+       double new_value;
+
+       if (track_min_y < current_view_min_y) {
+               // Track is above the current view
+               new_value = track_min_y;
+       } else {
+               // Track is below the current view
+               new_value = track->y_position () + track->effective_height() + canvas_timebars_vsize - vertical_adjustment.get_page_size();
+       }
+
+       vertical_adjustment.set_value(new_value);
+}
+
+void
+Editor::set_loop_from_selection (bool play)
+{
+       if (session == 0 || selection->time.empty()) {
+               return;
+       }
+
+       nframes64_t start = selection->time[clicked_selection].start;
+       nframes64_t end = selection->time[clicked_selection].end;
+       
+       set_loop_range (start, end,  _("set loop range from selection"));
+
+       if (play) {
+               session->request_play_loop (true);
+               session->request_locate (start, true);
+       }
+}
+
+void
+Editor::set_loop_from_edit_range (bool play)
+{
+       if (session == 0) {
+               return;
+       }
+
+       nframes64_t start;
+       nframes64_t end;
+       
+       if (!get_edit_op_range (start, end)) {
+               return;
+       }
+
+       set_loop_range (start, end,  _("set loop range from edit range"));
+
+       if (play) {
+               session->request_play_loop (true);
+               session->request_locate (start, true);
+       }
+}
+
+void
+Editor::set_loop_from_region (bool play)
+{
+       nframes64_t start = max_frames;
+       nframes64_t end = 0;
+
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
+               return;
+       }
+
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+               if ((*i)->region()->position() < start) {
+                       start = (*i)->region()->position();
+               }
+               if ((*i)->region()->last_frame() + 1 > end) {
+                       end = (*i)->region()->last_frame() + 1;
+               }
+       }
+
+       set_loop_range (start, end, _("set loop range from region"));
+
+       if (play) {
+               session->request_play_loop (true);
+               session->request_locate (start, true);
+       }
+}
+
+void
+Editor::set_punch_from_selection ()
+{
+       if (session == 0 || selection->time.empty()) {
+               return;
+       }
+
+       nframes64_t start = selection->time[clicked_selection].start;
+       nframes64_t end = selection->time[clicked_selection].end;
+       
+       set_punch_range (start, end,  _("set punch range from selection"));
+}
+
+void
+Editor::set_punch_from_edit_range ()
+{
+       if (session == 0) {
+               return;
+       }
+
+       nframes64_t start;
+       nframes64_t end;
+       
+       if (!get_edit_op_range (start, end)) {
+               return;
+       }
+
+       set_punch_range (start, end,  _("set punch range from edit range"));
+}
+
+void
+Editor::set_punch_from_region ()
+{
+       nframes64_t start = max_frames;
+       nframes64_t end = 0;
+
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
+               return;
+       }
+
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+               if ((*i)->region()->position() < start) {
+                       start = (*i)->region()->position();
+               }
+               if ((*i)->region()->last_frame() + 1 > end) {
+                       end = (*i)->region()->last_frame() + 1;
+               }
+       }
+
+       set_punch_range (start, end, _("set punch range from region"));
+}
+
+void
+Editor::pitch_shift_regions ()
+{
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+       
+       if (rs.empty()) {
+               return;
+       }
+
+       pitch_shift (rs, 1.2);
+}
+       
+void
+Editor::use_region_as_bar ()
+{
+       if (!session) {
+               return;
+       }
+
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
+               return;
+       }
+
+       RegionView* rv = rs.front();
+
+       define_one_bar (rv->region()->position(), rv->region()->last_frame() + 1);
+}
+
+void
+Editor::use_range_as_bar ()
+{
+       nframes64_t start, end;
+       if (get_edit_op_range (start, end)) {
+               define_one_bar (start, end);
+       }
+}
+
+void
+Editor::define_one_bar (nframes64_t start, nframes64_t end)
+{
+       nframes64_t length = end - start;
+       
+       const Meter& m (session->tempo_map().meter_at (start));
+
+       /* length = 1 bar */
+
+       /* now we want frames per beat.
+          we have frames per bar, and beats per bar, so ...
+       */
+
+       double frames_per_beat = length / m.beats_per_bar();
+       
+       /* beats per minute = */
+
+       double beats_per_minute = (session->frame_rate() * 60.0) / frames_per_beat;
+
+       /* now decide whether to:
+
+           (a) set global tempo 
+           (b) add a new tempo marker
+
+       */
+
+       const TempoSection& t (session->tempo_map().tempo_section_at (start));
+
+       bool do_global = false;
+
+       if ((session->tempo_map().n_tempos() == 1) && (session->tempo_map().n_meters() == 1)) {
+               
+               /* only 1 tempo & 1 meter: ask if the user wants to set the tempo
+                  at the start, or create a new marker
+               */
+
+               vector<string> options;
+               options.push_back (_("Cancel"));
+               options.push_back (_("Add new marker"));
+               options.push_back (_("Set global tempo"));
+               Choice c (_("Do you want to set the global tempo or add new tempo marker?"),
+                         options);
+               c.set_default_response (2);
+
+               switch (c.run()) {
+               case 0:
+                       return;
+
+               case 2:
+                       do_global = true;
+                       break;
+
+               default:
+                       do_global = false;
+               }
+
+       } else {
+
+               /* more than 1 tempo and/or meter section already, go ahead do the "usual":
+                  if the marker is at the region starter, change it, otherwise add
+                  a new tempo marker 
+               */
+       }
+
+       begin_reversible_command (_("set tempo from region"));
+       XMLNode& before (session->tempo_map().get_state());
+
+       if (do_global) {
+               session->tempo_map().change_initial_tempo (beats_per_minute, t.note_type());
+       } else if (t.frame() == start) {
+               session->tempo_map().change_existing_tempo_at (start, beats_per_minute, t.note_type());
+       } else {
+               session->tempo_map().add_tempo (Tempo (beats_per_minute, t.note_type()), start);
+       }
+
+       XMLNode& after (session->tempo_map().get_state());
+
+       session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
+       commit_reversible_command ();
+}
+
+void
+Editor::split_region_at_transients ()
+{
+       AnalysisFeatureList positions;
+
+       if (!session) {
+               return;
+       }
+
+       RegionSelection rs; 
+
+       get_regions_for_action (rs);
+
+       if (rs.empty()) {
+               return;
+       }
+
+       session->begin_reversible_command (_("split regions"));
+
+       for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ) {
+
+               RegionSelection::iterator tmp;
+
+               tmp = i;
+               ++tmp;
+
+               boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> ((*i)->region());
+               
+               if (ar && (ar->get_transients (positions) == 0)) {
+                       split_region_at_points ((*i)->region(), positions, true);
+                       positions.clear ();
+               }
+               
+               i = tmp;
+       }
+
+       session->commit_reversible_command ();
+
+}
+
+void
+Editor::split_region_at_points (boost::shared_ptr<Region> r, AnalysisFeatureList& positions, bool can_ferret)
+{
+       bool use_rhythmic_rodent = false;
+
+       boost::shared_ptr<Playlist> pl = r->playlist();
+       
+       if (!pl) {
+               return;
+       }
+       
+       if (positions.empty()) {
+               return;
+       }
+
+
+       if (positions.size() > 20) {
+               Glib::ustring msgstr = string_compose (_("You are about to split\n%1\ninto %2 pieces.\nThis could take a long time."), r->name(), positions.size() + 1);
+               MessageDialog msg (msgstr,
+                                  false,
+                                  Gtk::MESSAGE_INFO,
+                                  Gtk::BUTTONS_OK_CANCEL);
+
+               if (can_ferret) {
+                       msg.add_button (_("Call for the Ferret!"), RESPONSE_APPLY);
+                       msg.set_secondary_text (_("Press OK to continue with this split operation\nor ask the Ferret dialog to tune the analysis"));
+               } else {
+                       msg.set_secondary_text (_("Press OK to continue with this split operation"));
+               }
+
+               msg.set_title (_("Excessive split?"));
+               msg.present ();
+
+               int response = msg.run();
+               msg.hide ();
+               switch (response) {
+               case RESPONSE_OK:
+                       break;
+               case RESPONSE_APPLY:
+                       use_rhythmic_rodent = true;
+                       break;
+               default:
+                       return;
+               }
+       }
+       
+       if (use_rhythmic_rodent) {
+               show_rhythm_ferret ();
+               return;
+       }
+
+       AnalysisFeatureList::const_iterator x;  
+       
+       nframes64_t pos = r->position();
+
+       XMLNode& before (pl->get_state());
+       
+       x = positions.begin();
+       
+       while (x != positions.end()) {
+               if ((*x) > pos) {
+                       break;
+               }
+               ++x;
+       }
+       
+       if (x == positions.end()) {
+               return;
+       }
+       
+       pl->freeze ();
+       pl->remove_region (r);
+       
+       while (x != positions.end()) {
+               
+               /* file start = original start + how far we from the initial position ? 
+                */
+               
+               nframes64_t file_start = r->start() + (pos - r->position());
+
+               /* length = next position - current position
+                */
+               
+               nframes64_t len = (*x) - pos;
+
+               /* XXX we do we really want to allow even single-sample regions?
+                  shouldn't we have some kind of lower limit on region size?
+               */
+
+               if (len <= 0) {
+                       break;
+               }
+               
+               string new_name;
+               
+               if (session->region_name (new_name, r->name())) {
+                       break;
+               }
+               
+               /* do NOT announce new regions 1 by one, just wait till they are all done */
+
+               boost::shared_ptr<Region> nr = RegionFactory::create (r->sources(), file_start, len, new_name, 0, Region::DefaultFlags, false);
+               pl->add_region (nr, pos);
+
+               pos += len;
+               ++x;
+
+               if (*x > r->last_frame()) {
+
+                       /* add final fragment */
+                       
+                       file_start = r->start() + (pos - r->position());
+                       len = r->last_frame() - pos;
+
+                       nr = RegionFactory::create (r->sources(), file_start, len, new_name, 0, Region::DefaultFlags);
+                       pl->add_region (nr, pos);
+
+                       break;
+               }
+       } 
+
+       pl->thaw ();
+
+       XMLNode& after (pl->get_state());
+       
+       session->add_command (new MementoCommand<Playlist>(*pl, &before, &after));
+}
+
+void
+Editor::tab_to_transient (bool forward)
+{
+       AnalysisFeatureList positions;
+
+       if (!session) {
+               return;
+       }
+
+       nframes64_t pos = session->audible_frame ();
+
+       if (!selection->tracks.empty()) {
+
+               for (TrackSelection::iterator t = selection->tracks.begin(); t != selection->tracks.end(); ++t) {
+
+                       RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*t);
+
+                       if (rtv) {
+                               boost::shared_ptr<Diskstream> ds = rtv->get_diskstream();
+                               if (ds) {
+                                       boost::shared_ptr<Playlist> pl = rtv->get_diskstream()->playlist ();
+                                       if (pl) {
+                                               nframes64_t result = pl->find_next_transient (pos, forward ? 1 : -1);
+                                               
+                                               if (result >= 0) {
+                                                       positions.push_back (result);
+                                               }
+                                       }
+                               }
+                       }
+               }
+
+       } else {
+               
+               RegionSelection rs; 
+
+               get_regions_for_action (rs);
+       
+               if (rs.empty()) {
+                       return;
+               }
+               
+               for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
+                       (*r)->region()->get_transients (positions);
+               }
+       }
+
+       TransientDetector::cleanup_transients (positions, session->frame_rate(), 3.0);
+
+       if (forward) {
+               AnalysisFeatureList::iterator x;
+
+               for (x = positions.begin(); x != positions.end(); ++x) {
+                       if ((*x) > pos) {
+                               break;
+                       }
+               }
+
+               if (x != positions.end ()) {
+                       session->request_locate (*x);
+               }
+
+       } else {
+               AnalysisFeatureList::reverse_iterator x;
+
+               for (x = positions.rbegin(); x != positions.rend(); ++x) {
+                       if ((*x) < pos) {
+                               break;
+                       }
+               }
+
+               if (x != positions.rend ()) {
+                       session->request_locate (*x);
+               }
+       }
+}
+void
+Editor::playhead_forward_to_grid ()
+{
+       if (!session) return;
+       nframes64_t pos = playhead_cursor->current_frame;
+       if (pos < max_frames - 1) {
+               pos += 2;
+               snap_to_internal (pos, 1, false);
+               session->request_locate (pos);
+       }
+}
+
+
+void
+Editor::playhead_backward_to_grid ()
+{
+       if (!session) return;
+       nframes64_t pos = playhead_cursor->current_frame;
+       if (pos > 2) {
+               pos -= 2;
+               snap_to_internal (pos, -1, false);
+               session->request_locate (pos);
+       }
+}
+
+void
+Editor::set_track_height (uint32_t h)
+{
+       TrackSelection& ts (selection->tracks);
+
+       for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) {
+               (*x)->set_height (h);
+       }
+}
+
+void
+Editor::toggle_tracks_active ()
+{
+       TrackSelection& ts (selection->tracks);
+       bool first = true;
+       bool target = false;
+
+       if (ts.empty()) {
+               return;
+       }
+
+       for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) {
+               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*x);
+
+               if (rtv) {
+                       if (first) {
+                               target = !rtv->_route->active();
+                               first = false;
+                       }
+                       rtv->_route->set_active (target);
+               }
+       }
+}
+
+void
+Editor::remove_tracks ()
+{
+       TrackSelection& ts (selection->tracks);
+
+       if (ts.empty()) {
+               return;
+       }
+
+       vector<string> choices;
+       string prompt;
+       int ntracks = 0;
+       int nbusses = 0;
+       const char* trackstr;
+       const char* busstr;
+       vector<boost::shared_ptr<Route> > routes;
+
+       for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) {
+               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*x);
+               if (rtv) {
+                       if (rtv->is_track()) {
+                               ntracks++;
+                       } else {
+                               nbusses++;
+                       }
+               }
+               routes.push_back (rtv->_route);
+       }
+       
+       if (ntracks + nbusses == 0) {
+               return;
+       }
+
+       if (ntracks > 1) {
+               trackstr = _("tracks");
+       } else {
+               trackstr = _("track");
+       }
+
+       if (nbusses > 1) {
+               busstr = _("busses");
+       } else {
+               busstr = _("bus");
+       }
+
+       if (ntracks) {
+               if (nbusses) {
+                       prompt  = string_compose (_("Do you really want to remove %1 %2 and %3 %4?\n"
+                                                   "(You may also lose the playlists associated with the %2)\n\n"
+                                                   "This action cannot be undone!"),
+                                                 ntracks, trackstr, nbusses, busstr);
+               } else {
+                       prompt  = string_compose (_("Do you really want to remove %1 %2?\n"
+                                                   "(You may also lose the playlists associated with the %2)\n\n"
+                                                   "This action cannot be undone!"),
+                                                 ntracks, trackstr);
+               }
+       } else if (nbusses) {
+               prompt  = string_compose (_("Do you really want to remove %1 %2?"),
+                                         nbusses, busstr);
+       }
+
+       choices.push_back (_("No, do nothing."));
+       if (ntracks + nbusses > 1) {
+               choices.push_back (_("Yes, remove them."));
+       } else {
+               choices.push_back (_("Yes, remove it."));
+       }
+
+       Choice prompter (prompt, choices);
+
+       if (prompter.run () != 1) {
+               return;
+       }
+
+       for (vector<boost::shared_ptr<Route> >::iterator x = routes.begin(); x != routes.end(); ++x) {
+               session->remove_route (*x);
+       }
+}
+
+void
+Editor::do_insert_time ()
+{
+       if (selection->tracks.empty()) {
+               return;
+       }
+
+       ArdourDialog d (*this, _("Insert Time"));
+
+       nframes64_t const pos = get_preferred_edit_position ();
+       
+       d.get_vbox()->set_border_width (12);
+       d.get_vbox()->set_spacing (4);
+
+       Table table (2, 2);
+       table.set_spacings (4);
+
+       Label time_label (_("Time to insert:"));
+       time_label.set_alignment (1, 0.5);
+       table.attach (time_label, 0, 1, 0, 1, FILL | EXPAND);
+       AudioClock clock ("insertTimeClock", true, X_("InsertTimeClock"), true, true, true);
+       clock.set (0);
+       clock.set_session (session);
+       clock.set_bbt_reference (pos);  
+       table.attach (clock, 1, 2, 0, 1);
+
+       Label intersected_label (_("Intersected regions should:"));
+       intersected_label.set_alignment (1, 0.5);
+       table.attach (intersected_label, 0, 1, 1, 2, FILL | EXPAND);
+       ComboBoxText intersected_combo;
+       intersected_combo.append_text (_("stay in position"));
+       intersected_combo.append_text (_("move"));
+       intersected_combo.append_text (_("be split"));
+       intersected_combo.set_active (0);
+       table.attach (intersected_combo, 1, 2, 1, 2);
+
+       d.get_vbox()->pack_start (table);
+
+       CheckButton move_glued (_("Move glued regions"));
+       d.get_vbox()->pack_start (move_glued);
+       CheckButton move_markers (_("Move markers"));
+       d.get_vbox()->pack_start (move_markers);
+       CheckButton move_tempos (_("Move tempo and meter changes"));
+       d.get_vbox()->pack_start (move_tempos);
+       
+       d.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+       d.add_button (_("Insert time"), Gtk::RESPONSE_OK);
+       d.show_all ();
+
+       int response = d.run ();
+
+       if (response != RESPONSE_OK) {
+               return;
+       }
+
+       nframes64_t distance = clock.current_duration (pos);
+
+       if (distance == 0) {
+               return;
+       }
+
+       InsertTimeOption opt;
+
+       switch (intersected_combo.get_active_row_number ()) {
+       case 0:
+               opt = LeaveIntersected;
+               break;
+       case 1:
+               opt = MoveIntersected;
+               break;
+       case 2:
+               opt = SplitIntersected;
+               break;
+       }
+
+       insert_time (pos, distance, opt, move_glued.get_active(), move_markers.get_active(), move_tempos.get_active());
+}
+
+void
+Editor::insert_time (nframes64_t pos, nframes64_t frames, InsertTimeOption opt, 
+                    bool ignore_music_glue, bool markers_too, bool tempo_too)
+{
+       bool commit = false;
+
+       if (Config->get_edit_mode() == Lock) {
+               return;
+       }
+
+       begin_reversible_command (_("insert time"));
+
+       for (TrackSelection::iterator x = selection->tracks.begin(); x != selection->tracks.end(); ++x) {
+               /* regions */
+               boost::shared_ptr<Playlist> pl = (*x)->playlist();
+               
+               if (pl) {
+
+                       XMLNode &before = pl->get_state();
+                       
+                       if (opt == SplitIntersected) {
+                               pl->split (pos);
+                       }
+                       
+                       pl->shift (pos, frames, (opt == MoveIntersected), ignore_music_glue);
+                       
+                       XMLNode &after = pl->get_state();
+                       
+                       session->add_command (new MementoCommand<Playlist> (*pl, &before, &after));
+                       commit = true;
+               }
+                       
+               /* automation */
+               RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*x);
+               if (rtav) {
+                       rtav->route ()->shift (pos, frames);
+                       commit = true;
+               }
+       }
+
+       /* markers */
+       if (markers_too) {
+               bool moved = false;
+               XMLNode& before (session->locations()->get_state());
+               Locations::LocationList copy (session->locations()->list());
+
+               for (Locations::LocationList::iterator i = copy.begin(); i != copy.end(); ++i) {
+                       
+                       Locations::LocationList::const_iterator tmp;
+
+                       if ((*i)->start() >= pos) {
+                               (*i)->set_start ((*i)->start() + frames);
+                               if (!(*i)->is_mark()) {
+                                       (*i)->set_end ((*i)->end() + frames);
+                               }
+                               moved = true;
+                       }
+               }
+
+               if (moved) {
+                       XMLNode& after (session->locations()->get_state());
+                       session->add_command (new MementoCommand<Locations>(*session->locations(), &before, &after));
+               }
+       }
+
+       if (tempo_too) {
+               session->tempo_map().insert_time (pos, frames);
+       }
+
+       if (commit) {
+               commit_reversible_command ();
+       }
+}
+
+void
+Editor::fit_selected_tracks ()
+{
+       fit_tracks (selection->tracks);
+}
+
+void
+Editor::fit_tracks (TrackSelection & tracks)
+{
+       if (tracks.empty()) {
+               return;
+       }
+
+       uint32_t child_heights = 0;
+
+       for (TrackSelection::iterator t = tracks.begin(); t != tracks.end(); ++t) {
+
+               if (!(*t)->marked_for_display()) {
+                       continue;
+               }
+
+               child_heights += (*t)->effective_height() - (*t)->current_height();
+       }
+
+       uint32_t h = (uint32_t) floor ((_canvas_height - child_heights - canvas_timebars_vsize) / tracks.size());
+       double first_y_pos = DBL_MAX;
+
+       if (h < TimeAxisView::hSmall) {
+               MessageDialog msg (*this, _("There are too many tracks to fit in the current window"));
+               /* too small to be displayed */
+               return;
+       }
+
+       undo_visual_stack.push_back (current_visual_state());
+       
+       /* operate on all tracks, hide unselected ones that are in the middle of selected ones */
+       
+       bool prev_was_selected = false;
+       bool is_selected = tracks.contains (track_views.front());
+       bool next_is_selected;
+
+       for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) {
+
+               TrackViewList::iterator next;
+               
+               next = t;
+               ++next;
+               
+               if (next != track_views.end()) {
+                       next_is_selected = tracks.contains (*next);
+               } else {
+                       next_is_selected = false;
+               }
+
+               if (is_selected) {
+                       (*t)->set_height (h);
+                       first_y_pos = std::min ((*t)->y_position (), first_y_pos);
+               } else {
+                       if (prev_was_selected && next_is_selected) {
+                               hide_track_in_display (**t);
+                       }
+               }
+
+               prev_was_selected = is_selected;
+               is_selected = next_is_selected;
+       }
+
+       /* 
+          set the controls_layout height now, because waiting for its size 
+          request signal handler will cause the vertical adjustment setting to fail 
+       */ 
+
+       controls_layout.property_height () = full_canvas_height - canvas_timebars_vsize;
+       vertical_adjustment.set_value (first_y_pos);
+
+       redo_visual_stack.push_back (current_visual_state());
+}
+
+void
+Editor::save_visual_state (uint32_t n)
+{
+       while (visual_states.size() <= n) {
+               visual_states.push_back (0);
+       }
+
+       delete visual_states[n];
+
+       visual_states[n] = current_visual_state (true);
+       gdk_beep ();
+}
+
+void
+Editor::goto_visual_state (uint32_t n)
+{
+       if (visual_states.size() <= n) {
+               return;
+       }
+
+       if (visual_states[n] == 0) {
+               return;
+       }
+
+       use_visual_state (*visual_states[n]);
+}
+
+void
+Editor::start_visual_state_op (uint32_t n)
+{
+       cerr << "Start visual op\n";
+       if (visual_state_op_connection.empty()) {
+               visual_state_op_connection = Glib::signal_timeout().connect (bind (mem_fun (*this, &Editor::end_visual_state_op), n), 1000);
+               cerr << "\tqueued new timeout\n";
+       }
+}
+
+void
+Editor::cancel_visual_state_op (uint32_t n)
+{
+       if (!visual_state_op_connection.empty()) {
+               cerr << "cancel visual op, time to goto\n";
+               visual_state_op_connection.disconnect();
+               goto_visual_state (n);
+       } else {
+               cerr << "cancel visual op, do nothing\n";
+       }
+}
+
+bool
+Editor::end_visual_state_op (uint32_t n)
+{
+       visual_state_op_connection.disconnect();
+       save_visual_state (n);
+       
+       PopUp* pup = new PopUp (WIN_POS_MOUSE, 1000, true);
+       char buf[32];
+       snprintf (buf, sizeof (buf), _("Saved view %u"), n+1);
+       pup->set_text (buf);
+       pup->touch();
+
+       return false; // do not call again
 }