fix "alt+g" duplicate range selection.
[ardour.git] / gtk2_ardour / editor_ops.cc
index c84bae6ad44e41e0cdf776499af6c1902d1a469d..4589844bf6dcd0c1665525a5246dcfa6e983bd81 100644 (file)
@@ -50,6 +50,7 @@
 #include "ardour/playlist_factory.h"
 #include "ardour/profile.h"
 #include "ardour/quantize.h"
+#include "ardour/legatize.h"
 #include "ardour/region_factory.h"
 #include "ardour/reverse.h"
 #include "ardour/session.h"
@@ -83,6 +84,7 @@
 #include "mixer_strip.h"
 #include "mouse_cursors.h"
 #include "normalize_dialog.h"
+#include "note.h"
 #include "paste_context.h"
 #include "patch_change_dialog.h"
 #include "quantize_dialog.h"
@@ -217,14 +219,14 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions)
                a = tmp;
        }
 
+       latest_regionviews.clear ();
+
        vector<sigc::connection> region_added_connections;
 
        for (list<RouteTimeAxisView*>::iterator i = used_trackviews.begin(); i != used_trackviews.end(); ++i) {
                region_added_connections.push_back ((*i)->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view)));
        }
        
-       latest_regionviews.clear ();
-
        while (used_playlists.size() > 0) {
                list <boost::shared_ptr<Playlist > >::iterator i = used_playlists.begin();
                (*i)->thaw();
@@ -234,22 +236,51 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions)
        for (vector<sigc::connection>::iterator c = region_added_connections.begin(); c != region_added_connections.end(); ++c) {
                (*c).disconnect ();
        }
-       
-       commit_reversible_command ();
 
        if (frozen){
                EditorThaw(); /* Emit Signal */
        }
 
-       if (ARDOUR::Profile->get_mixbus()) {
-               //IFF we were working on selected regions, try to reinstate the other region selections that existed before the freeze/thaw.
-               _ignore_follow_edits = true;  //a split will change the region selection in mysterious ways;  its not practical or wanted to follow this edit
-               if( working_on_selection ) {
+       if (working_on_selection) {
+               // IFF we were working on selected regions, try to reinstate the other region selections that existed before the freeze/thaw.
+
+               _ignore_follow_edits = true;  // a split will change the region selection in mysterious ways;  it's not practical or wanted to follow this edit
+               RegionSelectionAfterSplit rsas = Config->get_region_selection_after_split();
+               /* There are three classes of regions that we might want selected after
+                  splitting selected regions:
+                   - regions selected before the split operation, and unaffected by it
+                   - newly-created regions before the split
+                   - newly-created regions after the split
+                */
+
+               if (rsas & Existing) {
+                       // region selections that existed before the split.
                        selection->add ( pre_selected_regions );
+               }
+
+               for (RegionSelection::iterator ri = latest_regionviews.begin(); ri != latest_regionviews.end(); ri++) {
+                       if ((*ri)->region()->position() < where) {
+                               // new regions created before the split
+                               if (rsas & NewlyCreatedLeft) {
+                                       selection->add (*ri);
+                               }
+                       } else {
+                               // new regions created after the split
+                               if (rsas & NewlyCreatedRight) {
+                                       selection->add (*ri);
+                               }
+                       }
+               }
+               _ignore_follow_edits = false;
+       } else {
+               _ignore_follow_edits = true;
+               if( working_on_selection ) {
                        selection->add (latest_regionviews);  //these are the new regions created after the split
                }
                _ignore_follow_edits = false;
        }
+
+       commit_reversible_command ();
 }
 
 /** Move one extreme of the current range selection.  If more than one range is selected,
@@ -1729,17 +1760,20 @@ Editor::temporal_zoom_region (bool both_axes)
        redo_visual_stack.push_back (current_visual_state (both_axes));
 }
 
-void
-Editor::zoom_to_region (bool both_axes)
-{
-       temporal_zoom_region (both_axes);
-}
 
 void
 Editor::temporal_zoom_selection (bool both_axes)
 {
        if (!selection) return;
 
+       //ToDo:  if notes are selected, zoom to that
+
+       //ToDo:  if control points are selected, zoom to that
+
+       //if region(s) are selected, zoom to that
+       if ( !selection->regions.empty() )
+               temporal_zoom_region (both_axes);
+
        //if a range is selected, zoom to that
        if (!selection->time.empty()) {
 
@@ -1753,11 +1787,8 @@ Editor::temporal_zoom_selection (bool both_axes)
                if (both_axes)
                        fit_selected_tracks();
 
-       } else {
-               temporal_zoom_region (both_axes);
        }
 
-
 }
 
 void
@@ -1874,7 +1905,7 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame)
 bool
 Editor::choose_new_marker_name(string &name) {
 
-       if (!Config->get_name_new_markers()) {
+       if (!ARDOUR_UI::config()->get_name_new_markers()) {
                /* don't prompt user for a new name */
                return true;
        }
@@ -1926,12 +1957,14 @@ Editor::add_location_from_selection ()
        _session->locations()->next_available_name(rangename,"selection");
        Location *location = new Location (*_session, start, end, rangename, Location::IsRangeMarker);
 
-       _session->begin_reversible_command (_("add marker"));
+       begin_reversible_command (_("add marker"));
+       
        XMLNode &before = _session->locations()->get_state();
        _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 ();
+       
+       commit_reversible_command ();
 }
 
 void
@@ -1946,12 +1979,14 @@ Editor::add_location_mark (framepos_t where)
                return;
        }
        Location *location = new Location (*_session, where, where, markername, Location::IsMark);
-       _session->begin_reversible_command (_("add marker"));
+       begin_reversible_command (_("add marker"));
+       
        XMLNode &before = _session->locations()->get_state();
        _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 ();
+       
+       commit_reversible_command ();
 }
 
 void
@@ -1966,7 +2001,8 @@ Editor::remove_location_at_playhead_cursor ()
        if (_session) {
 
                //set up for undo
-               _session->begin_reversible_command (_("remove marker"));
+               begin_reversible_command (_("remove marker"));
+               
                XMLNode &before = _session->locations()->get_state();
                bool removed = false;
 
@@ -1984,7 +2020,8 @@ Editor::remove_location_at_playhead_cursor ()
                if (removed) {
                        XMLNode &after = _session->locations()->get_state();
                        _session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-                       _session->commit_reversible_command ();
+                       
+                       commit_reversible_command ();
                }
        }
 }
@@ -1999,7 +2036,8 @@ Editor::add_locations_from_region ()
                return;
        }
 
-       _session->begin_reversible_command (selection->regions.size () > 1 ? _("add markers") : _("add marker"));
+       begin_reversible_command (selection->regions.size () > 1 ? _("add markers") : _("add marker"));
+       
        XMLNode &before = _session->locations()->get_state();
 
        for (RegionSelection::iterator i = rs.begin (); i != rs.end (); ++i) {
@@ -2013,7 +2051,8 @@ Editor::add_locations_from_region ()
 
        XMLNode &after = _session->locations()->get_state();
        _session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-       _session->commit_reversible_command ();
+       
+       commit_reversible_command ();
 }
 
 /** Add a single range marker around all selected regions */
@@ -2026,7 +2065,8 @@ Editor::add_location_from_region ()
                return;
        }
 
-       _session->begin_reversible_command (_("add marker"));
+       begin_reversible_command (_("add marker"));
+       
        XMLNode &before = _session->locations()->get_state();
 
        string markername;
@@ -2049,7 +2089,8 @@ Editor::add_location_from_region ()
 
        XMLNode &after = _session->locations()->get_state();
        _session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-       _session->commit_reversible_command ();
+       
+       commit_reversible_command ();
 }
 
 /* MARKS */
@@ -2105,12 +2146,14 @@ void
 Editor::clear_markers ()
 {
        if (_session) {
-               _session->begin_reversible_command (_("clear markers"));
+               begin_reversible_command (_("clear markers"));
+               
                XMLNode &before = _session->locations()->get_state();
                _session->locations()->clear_markers ();
                XMLNode &after = _session->locations()->get_state();
                _session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-               _session->commit_reversible_command ();
+               
+               commit_reversible_command ();
        }
 }
 
@@ -2118,27 +2161,30 @@ void
 Editor::clear_ranges ()
 {
        if (_session) {
-               _session->begin_reversible_command (_("clear ranges"));
+               begin_reversible_command (_("clear ranges"));
+               
                XMLNode &before = _session->locations()->get_state();
 
                _session->locations()->clear_ranges ();
 
                XMLNode &after = _session->locations()->get_state();
                _session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-               _session->commit_reversible_command ();
+               
+               commit_reversible_command ();
        }
 }
 
 void
 Editor::clear_locations ()
 {
-       _session->begin_reversible_command (_("clear locations"));
+       begin_reversible_command (_("clear locations"));
+       
        XMLNode &before = _session->locations()->get_state();
        _session->locations()->clear ();
        XMLNode &after = _session->locations()->get_state();
        _session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-       _session->commit_reversible_command ();
-       _session->locations()->clear ();
+       
+       commit_reversible_command ();
 }
 
 void
@@ -2302,7 +2348,7 @@ Editor::get_preroll ()
 void
 Editor::maybe_locate_with_edit_preroll ( framepos_t location )
 {
-       if ( _session->transport_rolling() || !Config->get_follow_edits() || _ignore_follow_edits )
+       if ( _session->transport_rolling() || !ARDOUR_UI::config()->get_follow_edits() || _ignore_follow_edits )
                return;
 
        location -= get_preroll();
@@ -2644,8 +2690,14 @@ Editor::create_region_from_selection (vector<boost::shared_ptr<Region> >& new_re
                return;
        }
 
-       framepos_t start = selection->time[clicked_selection].start;
-       framepos_t end = selection->time[clicked_selection].end;
+       framepos_t start, end;
+       if (clicked_selection) {
+               start = selection->time[clicked_selection].start;
+               end = selection->time[clicked_selection].end;
+       } else {
+               start = selection->time.start();
+               end = selection->time.end_frame();
+       }
 
        TrackViewList ts = selection->tracks.filter_to_unique_playlists ();
        sort_track_selection (ts);
@@ -3643,14 +3695,13 @@ Editor::freeze_route ()
 
        pthread_create_and_store (X_("freezer"), &itt.thread, _freeze_thread, this);
 
-       set_canvas_cursor (_cursors->wait);
+       CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
 
        while (!itt.done && !itt.cancel) {
                gtk_main_iteration ();
        }
 
        current_interthread_info = 0;
-       set_canvas_cursor (current_canvas_cursor);
 }
 
 void
@@ -3830,20 +3881,15 @@ Editor::cut_copy (CutCopyOp op)
                return;
        }
 
-       if (internal_editing()) {
-
-               switch (effective_mouse_mode()) {
-               case MouseObject:
-               case MouseRange:
-                       begin_reversible_command (opname + ' ' + X_("MIDI"));
-                       cut_copy_midi (op);
-                       commit_reversible_command ();
-                       break;
-               default:
-                       break;
-               }
-
+       switch (mouse_mode) {
+       case MouseDraw:
+       case MouseContent:
+               begin_reversible_command (opname + ' ' + X_("MIDI"));
+               cut_copy_midi (op);
+               commit_reversible_command ();
                return;
+       default:
+               break;
        }
 
        bool did_edit = false;
@@ -3911,7 +3957,7 @@ struct AutomationRecord {
  *  @param op Operation (Cut, Copy or Clear)
  */
 void
-Editor::cut_copy_points (CutCopyOp op)
+Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::MusicalTime earliest, bool midi)
 {
        if (selection->points.empty ()) {
                return;
@@ -3940,31 +3986,45 @@ Editor::cut_copy_points (CutCopyOp op)
                /* This operation will involve putting things in the cut buffer, so create an empty
                   ControlList for each of our source lists to put the cut buffer data in.
                */
-               framepos_t start = std::numeric_limits<framepos_t>::max();
                for (Lists::iterator i = lists.begin(); i != lists.end(); ++i) {
                        i->second.copy = i->first->create (i->first->parameter (), i->first->descriptor());
-
-                       /* Calculate earliest start position of any point in selection. */
-                       start = std::min(start, i->second.line->session_position(i->first->begin()));
                }
 
                /* Add all selected points to the relevant copy ControlLists */
+               framepos_t start = std::numeric_limits<framepos_t>::max();
                for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) {
                        boost::shared_ptr<AutomationList> al = (*i)->line().the_list();
-                       AutomationList::const_iterator j = (*i)->model ();
+                       AutomationList::const_iterator    j  = (*i)->model();
+
                        lists[al].copy->fast_simple_add ((*j)->when, (*j)->value);
+                       if (midi) {
+                               /* Update earliest MIDI start time in beats */
+                               earliest = std::min(earliest,  Evoral::MusicalTime((*j)->when));
+                       } else {
+                               /* Update earliest session start time in frames */
+                               start = std::min(start, (*i)->line().session_position(j));
+                       }
                }
 
                /* Snap start time backwards, so copy/paste is snap aligned. */
-               snap_to(start, RoundDownMaybe);
+               if (midi) {
+                       if (earliest == Evoral::MusicalTime::max()) {
+                               earliest = Evoral::MusicalTime();  // Weird... don't offset
+                       }
+                       earliest.round_down_to_beat();
+               } else {
+                       if (start == std::numeric_limits<double>::max()) {
+                               start = 0;  // Weird... don't offset
+                       }
+                       snap_to(start, RoundDownMaybe);
+               }
 
+               const double line_offset = midi ? earliest.to_double() : start;
                for (Lists::iterator i = lists.begin(); i != lists.end(); ++i) {
                        /* Correct this copy list so that it is relative to the earliest
                           start time, so relative ordering between points is preserved
-                          when copying from several lists. */
-                       const AutomationLine* line        = i->second.line;
-                       const double          line_offset = line->time_converter().from(start);
-
+                          when copying from several lists and the paste starts at the
+                          earliest copied piece of data. */
                        for (AutomationList::iterator j = i->second.copy->begin(); j != i->second.copy->end(); ++j) {
                                (*j)->when -= line_offset;
                        }
@@ -4002,9 +4062,13 @@ Editor::cut_copy_points (CutCopyOp op)
 void
 Editor::cut_copy_midi (CutCopyOp op)
 {
+       Evoral::MusicalTime earliest = Evoral::MusicalTime::max();
        for (MidiRegionSelection::iterator i = selection->midi_regions.begin(); i != selection->midi_regions.end(); ++i) {
                MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
                if (mrv) {
+                       if (!mrv->selection().empty()) {
+                               earliest = std::min(earliest, (*mrv->selection().begin())->note()->time());
+                       }
                        mrv->cut_copy_clear (op);
 
                        /* XXX: not ideal, as there may be more than one track involved in the selection */
@@ -4013,7 +4077,7 @@ Editor::cut_copy_midi (CutCopyOp op)
        }
 
        if (!selection->points.empty()) {
-               cut_copy_points (op);
+               cut_copy_points (op, earliest, true);
                if (op == Cut || op == Delete) {
                        selection->clear_points ();
                }
@@ -4041,6 +4105,8 @@ Editor::remove_clicked_region ()
                return;
        }
 
+       begin_reversible_command (_("remove region"));
+
        boost::shared_ptr<Playlist> playlist = clicked_routeview->playlist();
 
        playlist->clear_changes ();
@@ -4440,47 +4506,27 @@ Editor::paste_internal (framepos_t position, float times)
                   R1.A1, R1.A2, R2, R2.A1, ... */
        }
 
-       if (internal_editing ()) {
+       begin_reversible_command (Operations::paste);
 
-               /* undo/redo is handled by individual tracks/regions */
-
-               RegionSelection rs;
-               get_regions_at (rs, position, ts);
-
-               if (ts.size() == 1 && cut_buffer->lines.size() == 1) {
-                       AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*>(ts.front());
-                       if (atv) {
-                               /* Only one line, and one automation track selected.  Do a
-                                  "greedy" paste from one automation type to another. */
-                               PasteContext ctx(paste_count, times, ItemCounts(), true);
-                               begin_reversible_command (Operations::paste);
-                               atv->paste (position, *cut_buffer, ctx);
-                               commit_reversible_command ();
-                               return;
-                       }
-               }
+       if (ts.size() == 1 && cut_buffer->lines.size() == 1 &&
+           dynamic_cast<AutomationTimeAxisView*>(ts.front())) {
+           /* Only one line copied, and one automation track selected.  Do a
+              "greedy" paste from one automation type to another. */
 
-               PasteContext ctx(paste_count, times, ItemCounts(), false);
-               for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
-                       MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (*r);
-                       if (mrv) {
-                               mrv->paste (position, *cut_buffer, ctx);
-                       }
-               }
+           PasteContext ctx(paste_count, times, ItemCounts(), true);
+           ts.front()->paste (position, *cut_buffer, ctx);
 
        } else {
 
-               /* we do redo (do you do voodoo?) */
-
-               begin_reversible_command (Operations::paste);
+               /* Paste into tracks */
 
                PasteContext ctx(paste_count, times, ItemCounts(), false);
                for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) {
                        (*i)->paste (position, *cut_buffer, ctx);
                }
-
-               commit_reversible_command ();
        }
+
+       commit_reversible_command ();
 }
 
 void
@@ -4516,11 +4562,11 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times)
                foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end());
        }
 
-       commit_reversible_command ();
-
        if (!foo.empty()) {
                selection->set (foo);
        }
+
+       commit_reversible_command ();
 }
 
 void
@@ -4551,7 +4597,13 @@ Editor::duplicate_selection (float times)
                        continue;
                }
                playlist->clear_changes ();
-               playlist->duplicate (*ri, selection->time[clicked_selection].end, times);
+               framepos_t end;
+               if (clicked_selection) {
+                       end = selection->time[clicked_selection].end;
+               } else {
+                       end = selection->time.end_frame();
+               }
+               playlist->duplicate (*ri, end, times);
                _session->add_command (new StatefulDiffCommand (playlist));
 
                ++ri;
@@ -4693,7 +4745,7 @@ Editor::normalize_region ()
                return;
        }
 
-       set_canvas_cursor (_cursors->wait);
+       CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
        gdk_flush ();
 
        /* XXX: should really only count audio regions here */
@@ -4712,7 +4764,6 @@ Editor::normalize_region ()
 
                        if (a == -1) {
                                /* the user cancelled the operation */
-                               set_canvas_cursor (current_canvas_cursor);
                                return;
                        }
 
@@ -4743,7 +4794,6 @@ Editor::normalize_region ()
        }
 
        commit_reversible_command ();
-       set_canvas_cursor (current_canvas_cursor);
 }
 
 
@@ -4871,26 +4921,22 @@ Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv
 }
 
 void
-Editor::apply_midi_note_edit_op (MidiOperator& op)
+Editor::apply_midi_note_edit_op (MidiOperator& op, const RegionSelection& rs)
 {
-       Command* cmd;
-
-       RegionSelection rs = get_regions_from_selection_and_entered ();
-
        if (rs.empty()) {
                return;
        }
 
        begin_reversible_command (op.name ());
 
-       for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) {
-               RegionSelection::iterator tmp = r;
+       for (RegionSelection::const_iterator r = rs.begin(); r != rs.end(); ) {
+               RegionSelection::const_iterator tmp = r;
                ++tmp;
 
                MidiRegionView* const mrv = dynamic_cast<MidiRegionView*> (*r);
 
                if (mrv) {
-                       cmd = apply_midi_note_edit_op_to_region (op, *mrv);
+                       Command* cmd = apply_midi_note_edit_op_to_region (op, *mrv);
                        if (cmd) {
                                (*cmd)();
                                _session->add_command (cmd);
@@ -4914,7 +4960,7 @@ Editor::fork_region ()
 
        begin_reversible_command (_("Fork Region(s)"));
 
-       set_canvas_cursor (_cursors->wait);
+       CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
        gdk_flush ();
 
        for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) {
@@ -4941,33 +4987,20 @@ Editor::fork_region ()
        }
 
        commit_reversible_command ();
-
-       set_canvas_cursor (current_canvas_cursor);
 }
 
 void
 Editor::quantize_region ()
 {
-       int selected_midi_region_cnt = 0;
-
-       if (!_session) {
-               return;
-       }
-
-       RegionSelection rs = get_regions_from_selection_and_entered ();
-
-       if (rs.empty()) {
-               return;
-       }
-
-       for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
-               MidiRegionView* const mrv = dynamic_cast<MidiRegionView*> (*r);
-               if (mrv) {
-                       selected_midi_region_cnt++;
-               }
+       if (_session) {
+               quantize_regions(get_regions_from_selection_and_entered ());
        }
+}
 
-       if (selected_midi_region_cnt == 0) {
+void
+Editor::quantize_regions (const RegionSelection& rs)
+{
+       if (rs.n_midi_regions() == 0) {
                return;
        }
 
@@ -4982,10 +5015,29 @@ Editor::quantize_region ()
                                qd->start_grid_size(), qd->end_grid_size(),
                                qd->strength(), qd->swing(), qd->threshold());
 
-               apply_midi_note_edit_op (quant);
+               apply_midi_note_edit_op (quant, rs);
        }
 }
 
+void
+Editor::legatize_region (bool shrink_only)
+{
+       if (_session) {
+               legatize_regions(get_regions_from_selection_and_entered (), shrink_only);
+       }
+}
+
+void
+Editor::legatize_regions (const RegionSelection& rs, bool shrink_only)
+{
+       if (rs.n_midi_regions() == 0) {
+               return;
+       }
+
+       Legatize legatize(shrink_only);
+       apply_midi_note_edit_op (legatize, rs);
+}
+
 void
 Editor::insert_patch_change (bool from_context)
 {
@@ -5031,7 +5083,7 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress
 
        begin_reversible_command (command);
 
-       set_canvas_cursor (_cursors->wait);
+       CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
        gdk_flush ();
 
        int n = 0;
@@ -5084,7 +5136,7 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress
                                
                                _session->add_command(new StatefulDiffCommand (playlist));
                        } else {
-                               goto out;
+                               return;
                        }
 
                        if (progress) {
@@ -5097,9 +5149,6 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress
        }
 
        commit_reversible_command ();
-
-  out:
-       set_canvas_cursor (current_canvas_cursor);
 }
 
 void
@@ -5117,8 +5166,8 @@ Editor::reset_region_gain_envelopes ()
                return;
        }
 
-       _session->begin_reversible_command (_("reset region gain"));
-
+       begin_reversible_command (_("reset region gain"));
+       
        for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
                AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
                if (arv) {
@@ -5129,8 +5178,8 @@ Editor::reset_region_gain_envelopes ()
                        _session->add_command (new MementoCommand<AutomationList>(*arv->audio_region()->envelope().get(), &before, &alist->get_state()));
                }
        }
-
-       _session->commit_reversible_command ();
+       
+       commit_reversible_command ();
 }
 
 void
@@ -5170,8 +5219,8 @@ Editor::toggle_gain_envelope_active ()
                return;
        }
 
-       _session->begin_reversible_command (_("region gain envelope active"));
-
+       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) {
@@ -5180,8 +5229,8 @@ Editor::toggle_gain_envelope_active ()
                        _session->add_command (new StatefulDiffCommand (arv->region()));
                }
        }
-
-       _session->commit_reversible_command ();
+       
+       commit_reversible_command ();
 }
 
 void
@@ -5197,15 +5246,15 @@ Editor::toggle_region_lock ()
                return;
        }
 
-       _session->begin_reversible_command (_("toggle region lock"));
-
+       begin_reversible_command (_("toggle region lock"));
+       
        for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
                (*i)->region()->clear_changes ();
                (*i)->region()->set_locked (!(*i)->region()->locked());
                _session->add_command (new StatefulDiffCommand ((*i)->region()));
        }
-
-       _session->commit_reversible_command ();
+       
+       commit_reversible_command ();
 }
 
 void
@@ -5221,15 +5270,15 @@ Editor::toggle_region_video_lock ()
                return;
        }
 
-       _session->begin_reversible_command (_("Toggle Video Lock"));
-
+       begin_reversible_command (_("Toggle Video Lock"));
+       
        for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
                (*i)->region()->clear_changes ();
                (*i)->region()->set_video_locked (!(*i)->region()->video_locked());
                _session->add_command (new StatefulDiffCommand ((*i)->region()));
        }
-
-       _session->commit_reversible_command ();
+       
+       commit_reversible_command ();
 }
 
 void
@@ -5245,16 +5294,16 @@ Editor::toggle_region_lock_style ()
                return;
        }
 
-       _session->begin_reversible_command (_("region lock style"));
-
+       begin_reversible_command (_("region lock style"));
+       
        for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
                (*i)->region()->clear_changes ();
                PositionLockStyle const ns = (*i)->region()->position_lock_style() == AudioTime ? MusicTime : AudioTime;
                (*i)->region()->set_position_lock_style (ns);
                _session->add_command (new StatefulDiffCommand ((*i)->region()));
        }
-
-       _session->commit_reversible_command ();
+       
+       commit_reversible_command ();
 }
 
 void
@@ -5270,15 +5319,15 @@ Editor::toggle_opaque_region ()
                return;
        }
 
-       _session->begin_reversible_command (_("change region opacity"));
-
+       begin_reversible_command (_("change region opacity"));
+       
        for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
                (*i)->region()->clear_changes ();
                (*i)->region()->set_opaque (!(*i)->region()->opaque());
                _session->add_command (new StatefulDiffCommand ((*i)->region()));
        }
-
-       _session->commit_reversible_command ();
+       
+       commit_reversible_command ();
 }
 
 void
@@ -5676,8 +5725,9 @@ Editor::set_playhead_cursor ()
                }
        }
 
-       if ( Config->get_follow_edits() )
+       if (ARDOUR_UI::config()->get_follow_edits()) {
                cancel_time_selection();
+       }
 }
 
 void
@@ -5850,6 +5900,34 @@ Editor::set_punch_from_selection ()
        set_punch_range (start, end,  _("set punch range from selection"));
 }
 
+void
+Editor::set_session_extents_from_selection ()
+{
+       if (_session == 0 || selection->time.empty()) {
+               return;
+       }
+
+       begin_reversible_command (_("set session start/stop from selection"));
+
+       framepos_t start = selection->time[clicked_selection].start;
+       framepos_t end = selection->time[clicked_selection].end;
+
+       Location* loc;
+       if ((loc = _session->locations()->session_range_location()) == 0) {
+               _session->set_session_extents ( start, end );  // this will create a new session range;  no need for UNDO
+       } else {
+               XMLNode &before = loc->get_state();
+
+               _session->set_session_extents ( start, end );
+
+               XMLNode &after = loc->get_state();
+
+               _session->add_command (new MementoCommand<Location>(*loc, &before, &after));
+
+               commit_reversible_command ();
+       }
+}
+
 void
 Editor::set_punch_from_edit_range ()
 {
@@ -6058,8 +6136,8 @@ Editor::split_region_at_transients ()
                return;
        }
 
-       _session->begin_reversible_command (_("split regions"));
-
+       begin_reversible_command (_("split regions"));
+       
        for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ) {
 
                RegionSelection::iterator tmp;
@@ -6076,8 +6154,8 @@ Editor::split_region_at_transients ()
 
                i = tmp;
        }
-
-       _session->commit_reversible_command ();
+       
+       commit_reversible_command ();
 
 }
 
@@ -6265,14 +6343,14 @@ Editor::place_transient()
 
        framepos_t where = get_preferred_edit_position();
 
-       _session->begin_reversible_command (_("place transient"));
-
+       begin_reversible_command (_("place transient"));
+       
        for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
                framepos_t position = (*r)->region()->position();
                (*r)->region()->add_transient(where - position);
        }
-
-       _session->commit_reversible_command ();
+       
+       commit_reversible_command ();
 }
 
 void
@@ -6300,8 +6378,8 @@ Editor::snap_regions_to_grid ()
                return;
        }
 
-       _session->begin_reversible_command (_("snap regions to grid"));
-
+       begin_reversible_command (_("snap regions to grid"));
+       
        for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
 
                boost::shared_ptr<Playlist> pl = (*r)->region()->playlist();
@@ -6324,8 +6402,8 @@ Editor::snap_regions_to_grid ()
                (*i)->thaw();
                used_playlists.pop_front();
        }
-
-       _session->commit_reversible_command ();
+       
+       commit_reversible_command ();
 }
 
 void
@@ -6383,8 +6461,8 @@ Editor::close_region_gaps ()
 
        /* Iterate over the region list and make adjacent regions overlap by crossfade_len_ms */
 
-       _session->begin_reversible_command (_("close region gaps"));
-
+       begin_reversible_command (_("close region gaps"));
+       
        int idx = 0;
        boost::shared_ptr<Region> last_region;
 
@@ -6423,8 +6501,8 @@ Editor::close_region_gaps ()
                (*i)->thaw();
                used_playlists.pop_front();
        }
-
-       _session->commit_reversible_command ();
+       
+       commit_reversible_command ();
 }
 
 void
@@ -7032,7 +7110,7 @@ Editor::toggle_region_mute ()
 
                (*i)->region()->playlist()->clear_changes ();
                (*i)->region()->set_muted (!(*i)->region()->muted ());
-               _session->add_command (new StatefulDiffCommand ((*i)->region()->playlist()));
+               _session->add_command (new StatefulDiffCommand ((*i)->region()));
 
        }