restore correct functioning of fit-tracks, which was mistakenly removed because of...
[ardour.git] / gtk2_ardour / editor_ops.cc
index 6ef4cebf6b67f95e428a5e3e3ee3606f1ad8d8c6..f4582704d8c96e86532a0363fe1f41db5f5950b3 100644 (file)
 
 #include "canvas/canvas.h"
 
+#include "actions.h"
 #include "ardour_ui.h"
-#include "debug.h"
-#include "editor.h"
-#include "time_axis_view.h"
-#include "route_time_axis.h"
+#include "audio_region_view.h"
+#include "audio_streamview.h"
 #include "audio_time_axis.h"
 #include "automation_time_axis.h"
 #include "control_point.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 "debug.h"
 #include "editing.h"
-#include "gtk-custom-hruler.h"
-#include "gui_thread.h"
-#include "keyboard.h"
-#include "utils.h"
+#include "editor.h"
+#include "editor_cursors.h"
 #include "editor_drag.h"
-#include "strip_silence_dialog.h"
-#include "editor_routes.h"
 #include "editor_regions.h"
-#include "quantize_dialog.h"
-#include "interthread_progress_window.h"
+#include "editor_routes.h"
+#include "gui_thread.h"
 #include "insert_time_dialog.h"
-#include "normalize_dialog.h"
-#include "editor_cursors.h"
+#include "interthread_progress_window.h"
+#include "keyboard.h"
+#include "midi_region_view.h"
 #include "mouse_cursors.h"
+#include "normalize_dialog.h"
 #include "patch_change_dialog.h"
+#include "quantize_dialog.h"
+#include "region_gain_line.h"
+#include "rgb_macros.h"
+#include "route_time_axis.h"
+#include "selection.h"
+#include "selection_templates.h"
+#include "streamview.h"
+#include "strip_silence_dialog.h"
+#include "time_axis_view.h"
 #include "transpose_dialog.h"
 
 #include "i18n.h"
@@ -133,7 +133,11 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions)
 {
        bool frozen = false;
 
-       list <boost::shared_ptr<Playlist > > used_playlists;
+       RegionSelection pre_selected_regions = selection->regions;
+       bool working_on_selection = !pre_selected_regions.empty();
+       
+       list<boost::shared_ptr<Playlist> > used_playlists;
+       list<RouteTimeAxisView*> used_trackviews;
 
        if (regions.empty()) {
                return;
@@ -188,9 +192,16 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions)
 
                        /* remember used playlists so we can thaw them later */
                        used_playlists.push_back(pl);
+
+                       TimeAxisView& tv = (*a)->get_time_axis_view();
+                       RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&tv);
+                       if (rtv) {
+                               used_trackviews.push_back (rtv);
+                       }
                        pl->freeze();
                }
 
+
                if (pl) {
                        pl->clear_changes ();
                        pl->split_region ((*a)->region(), where);
@@ -200,17 +211,38 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions)
                a = tmp;
        }
 
+       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();
                used_playlists.pop_front();
        }
 
+       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 */
        }
+
+       //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 ) {
+               selection->add ( pre_selected_regions );
+               selection->add (latest_regionviews);  //these are the new regions created after the split
+       }
+       _ignore_follow_edits = false;
+
 }
 
 /** Move one extreme of the current range selection.  If more than one range is selected,
@@ -511,6 +543,60 @@ Editor::nudge_backward_capture_offset ()
        commit_reversible_command ();
 }
 
+struct RegionSelectionPositionSorter {
+        bool operator() (RegionView* a, RegionView* b) {
+                return a->region()->position() < b->region()->position();
+        }
+};
+
+void
+Editor::sequence_regions ()
+{
+       framepos_t r_end;
+       framepos_t r_end_prev;
+
+       int iCount=0;
+
+       if (!_session) {
+               return;
+       }
+
+       RegionSelection rs = get_regions_from_selection_and_entered ();
+       rs.sort(RegionSelectionPositionSorter());
+
+       if (!rs.empty()) {
+
+               begin_reversible_command (_("sequence regions"));
+               for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+                       boost::shared_ptr<Region> r ((*i)->region());
+
+                       r->clear_changes();
+
+                       if(r->locked())
+                       {
+                               continue;
+                       }
+                       if(r->position_locked())
+                       {
+                               continue;
+                       }
+                       if(iCount>0)
+                       {
+                               r_end_prev=r_end;
+                               r->set_position(r_end_prev);
+                       }
+
+                       _session->add_command (new StatefulDiffCommand (r));
+
+                       r_end=r->position() + r->length();
+
+                       iCount++;
+               }
+               commit_reversible_command ();
+       } 
+} 
+
+
 /* DISPLAY MOTION */
 
 void
@@ -1275,12 +1361,80 @@ Editor::scroll_tracks_up_line ()
        reset_y_origin (vertical_adjustment.get_value() - 60);
 }
 
+bool
+Editor::scroll_down_one_track ()
+{
+       TrackViewList::reverse_iterator next = track_views.rend();
+       std::pair<TimeAxisView*,double> res;
+       const double bottom_of_trackviews = vertical_adjustment.get_value() + vertical_adjustment.get_page_size() - 1;
+
+       for (TrackViewList::reverse_iterator t = track_views.rbegin(); t != track_views.rend(); ++t) {
+               if ((*t)->hidden()) {
+                       continue;
+               }
+               
+               /* If this is the bottom visible trackview, we want to display
+                  the next one.
+               */
+
+               res = (*t)->covers_y_position (bottom_of_trackviews);
+
+               if (res.first) {
+                       break;
+               }
+
+               ++next; // moves "next" towards the "front" since it is a reverse iterator
+       }
+
+       /* move to the track below the first one that covers the */
+       
+       if (next != track_views.rend()) {
+               ensure_time_axis_view_is_visible (**next);
+               return true;
+       }
+
+       return false;
+}      
+
+bool
+Editor::scroll_up_one_track ()
+{
+       double vertical_pos = vertical_adjustment.get_value ();
+
+       TrackViewList::iterator prev = track_views.end();
+       std::pair<TimeAxisView*,double> res;
+
+       for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) {
+
+               if ((*t)->hidden()) {
+                       continue;
+               }
+
+               /* find the trackview at the top of the trackview group */
+               res = (*t)->covers_y_position (vertical_pos);
+               
+               if (res.first) {
+                       cerr << res.first->name() << " covers the top\n";
+                       break;
+               }
+
+               prev = t;
+       }
+       
+       if (prev != track_views.end()) {
+               ensure_time_axis_view_is_visible (**prev);
+               return true;
+       }
+
+       return false;
+}
+
 /* ZOOM */
 
 void
 Editor::tav_zoom_step (bool coarser)
 {
-       _routes->suspend_redisplay ();
+       DisplaySuspender ds;
 
        TrackViewList* ts;
 
@@ -1294,14 +1448,12 @@ Editor::tav_zoom_step (bool coarser)
                TimeAxisView *tv = (static_cast<TimeAxisView*>(*i));
                        tv->step_height (coarser);
        }
-
-       _routes->resume_redisplay ();
 }
 
 void
 Editor::tav_zoom_smooth (bool coarser, bool force_all)
 {
-       _routes->suspend_redisplay ();
+       DisplaySuspender ds;
 
        TrackViewList* ts;
 
@@ -1326,27 +1478,8 @@ Editor::tav_zoom_smooth (bool coarser, bool force_all)
                        tv->set_height (h + 5);
                }
        }
-
-       _routes->resume_redisplay ();
 }
 
-bool
-Editor::clamp_samples_per_pixel (framecnt_t& fpp) const
-{
-       bool clamped = false;
-       
-       if (fpp < 1) {
-               fpp = 1;
-               clamped = true;
-       }
-
-       if (max_framepos / fpp < 800) {
-               fpp = max_framepos / 800;
-               clamped = true;
-       }
-
-       return clamped;
-}
 
 void
 Editor::temporal_zoom_step (bool coarser)
@@ -1383,7 +1516,6 @@ Editor::temporal_zoom (framecnt_t fpp)
        framecnt_t nfpp;
        double l;
 
-       clamp_samples_per_pixel (fpp);
        if (fpp == samples_per_pixel) {
                return;
        }
@@ -1391,8 +1523,12 @@ Editor::temporal_zoom (framecnt_t fpp)
        // Imposing an arbitrary limit to zoom out as too much zoom out produces 
        // segfaults for lack of memory. If somebody decides this is not high enough I
        // believe it can be raisen to higher values but some limit must be in place.
+       //
+       // This constant represents 1 day @ 48kHz on a 1600 pixel wide display
+       // all of which is used for the editor track displays. The whole day
+       // would be 4147200000 samples, so 2592000 samples per pixel.
 
-       nfpp = min (fpp, (framecnt_t) 8589934592);
+       nfpp = min (fpp, (framecnt_t) 2592000);
        nfpp = max ((framecnt_t) 1, fpp);
 
        new_page_size = (framepos_t) floor (_visible_canvas_width * nfpp);
@@ -1568,7 +1704,7 @@ Editor::temporal_zoom_region (bool both_axes)
 
                /* hide irrelevant tracks */
 
-               _routes->suspend_redisplay ();
+               DisplaySuspender ds;
 
                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                        if (find (tracks.begin(), tracks.end(), (*i)) == tracks.end()) {
@@ -1576,8 +1712,6 @@ Editor::temporal_zoom_region (bool both_axes)
                        }
                }
 
-               _routes->resume_redisplay ();
-
                vertical_adjustment.set_value (0.0);
        }
 
@@ -1655,23 +1789,38 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame)
        if (!_session) {
                return;
        }
-       double range_before = frame - leftmost_frame;
-       double new_fpp;
 
-       new_fpp = samples_per_pixel;
+       framecnt_t range_before = frame - leftmost_frame;
+       framecnt_t new_spp;
 
        if (coarser) {
-               new_fpp *= 1.61803399;
-               range_before *= 1.61803399;
+               if (samples_per_pixel <= 1) {
+                       new_spp = 2;
+               } else {
+                       new_spp = samples_per_pixel + (samples_per_pixel/2);
+               }
+               range_before += range_before/2;
        } else {
-               new_fpp = max(1.0,(new_fpp/1.61803399));
-               range_before /= 1.61803399;
+               if (samples_per_pixel >= 1) {
+                       new_spp = samples_per_pixel - (samples_per_pixel/2);
+               } else {
+                       /* could bail out here since we cannot zoom any finer,
+                          but leave that to the equality test below
+                       */
+                       new_spp = samples_per_pixel;
+               }
+
+               range_before -= range_before/2;
        }
 
-       if (new_fpp == samples_per_pixel)  {
+       if (new_spp == samples_per_pixel)  {
                return;
        }
 
+       /* zoom focus is automatically taken as @param frame when this
+          method is used.
+       */
+       
        framepos_t new_leftmost = frame - (framepos_t)range_before;
 
        if (new_leftmost > frame) {
@@ -1682,7 +1831,7 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame)
                new_leftmost = 0;
        }
 
-       reposition_and_zoom (new_leftmost, new_fpp);
+       reposition_and_zoom (new_leftmost, new_spp);
 }
 
 
@@ -1775,6 +1924,35 @@ Editor::add_location_from_playhead_cursor ()
        add_location_mark (_session->audible_frame());
 }
 
+void
+Editor::remove_location_at_playhead_cursor ()
+{
+       if (_session) {
+
+               //set up for undo
+               _session->begin_reversible_command (_("remove marker"));
+               XMLNode &before = _session->locations()->get_state();
+               bool removed = false;
+
+               //find location(s) at this time
+               Locations::LocationList locs;
+               _session->locations()->find_all_between (_session->audible_frame(), _session->audible_frame()+1, locs, Location::Flags(0));
+               for (Locations::LocationList::iterator i = locs.begin(); i != locs.end(); ++i) {
+                       if ((*i)->is_mark()) {
+                               _session->locations()->remove (*i);
+                               removed = true;
+                       }
+               }
+               
+               //store undo
+               if (removed) {
+                       XMLNode &after = _session->locations()->get_state();
+                       _session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
+                       _session->commit_reversible_command ();
+               }
+       }
+}
+
 /** Add a range marker around each selected region */
 void
 Editor::add_locations_from_region ()
@@ -1959,85 +2137,6 @@ Editor::unhide_ranges ()
 
 /* INSERT/REPLACE */
 
-void
-Editor::insert_region_list_drag (boost::shared_ptr<Region> region, int x, int y)
-{
-       double cx, cy;
-       framepos_t where;
-       RouteTimeAxisView *rtv = 0;
-       boost::shared_ptr<Playlist> playlist;
-
-       GdkEvent event;
-       event.type = GDK_BUTTON_RELEASE;
-       event.button.x = x;
-       event.button.y = y;
-
-       where = window_event_frame (&event, &cx, &cy);
-
-       if (where < leftmost_frame || where > leftmost_frame + current_page_samples()) {
-               /* clearly outside canvas area */
-               return;
-       }
-
-       std::pair<TimeAxisView*, int> tv = trackview_by_y_position (cy);
-       if (tv.first == 0) {
-               return;
-       }
-
-       if ((rtv = dynamic_cast<RouteTimeAxisView*> (tv.first)) == 0) {
-               return;
-       }
-
-       if ((playlist = rtv->playlist()) == 0) {
-               return;
-       }
-
-       snap_to (where);
-
-       begin_reversible_command (_("insert dragged region"));
-       playlist->clear_changes ();
-       playlist->add_region (RegionFactory::create (region, true), where, 1.0);
-       _session->add_command(new StatefulDiffCommand (playlist));
-       commit_reversible_command ();
-}
-
-void
-Editor::insert_route_list_drag (boost::shared_ptr<Route> route, int x, int y)
-{
-       double cx, cy;
-       RouteTimeAxisView *dest_rtv = 0;
-       RouteTimeAxisView *source_rtv = 0;
-
-       GdkEvent event;
-       event.type = GDK_BUTTON_RELEASE;
-       event.button.x = x;
-       event.button.y = y;
-
-       window_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)
 {
@@ -2070,6 +2169,9 @@ Editor::insert_region_list_selection (float times)
        begin_reversible_command (_("insert region"));
        playlist->clear_changes ();
        playlist->add_region ((RegionFactory::create (region, true)), get_preferred_edit_position(), times);
+       if (Config->get_edit_mode() == Ripple)
+               playlist->ripple (get_preferred_edit_position(), region->length() * times, boost::shared_ptr<Region>());
+
        _session->add_command(new StatefulDiffCommand (playlist));
        commit_reversible_command ();
 }
@@ -2172,7 +2274,7 @@ Editor::get_preroll ()
 void
 Editor::maybe_locate_with_edit_preroll ( framepos_t location )
 {
-       if ( _session->transport_rolling() || !Config->get_always_play_range() )
+       if ( _session->transport_rolling() || !Config->get_follow_edits() || _ignore_follow_edits )
                return;
 
        location -= get_preroll();
@@ -2693,8 +2795,7 @@ Editor::separate_regions_between (const TimeSelection& ts)
        }
 
        if (in_command) {
-               selection->set (new_selection);
-               set_mouse_mode (MouseObject);
+//             selection->set (new_selection);
 
                commit_reversible_command ();
        }
@@ -3453,10 +3554,8 @@ Editor::freeze_thread ()
        /* create event pool because we may need to talk to the session */
        SessionEvent::create_per_thread_pool ("freeze events", 64);
        /* create per-thread buffers for process() tree to use */
-       current_interthread_info->process_thread.get_buffers ();
        clicked_routeview->audio_track()->freeze_me (*current_interthread_info);
        current_interthread_info->done = true;
-       current_interthread_info->process_thread.drop_buffers();
        return 0;
 }
 
@@ -3473,7 +3572,7 @@ Editor::freeze_route ()
        
        /* wait for just a little while, because the above call is asynchronous */
 
-       ::usleep (250000);
+       Glib::usleep (250000);
 
        if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) {
                return;
@@ -3633,30 +3732,15 @@ Editor::copy ()
 bool
 Editor::can_cut_copy () const
 {
-       switch (effective_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;
-       }
+       if (!selection->time.empty() || !selection->regions.empty() || !selection->points.empty())
+               return true;
 
        return false;
 }
 
 
 /** Cut, copy or clear selected regions, automation points or a time range.
- * @param op Operation (Cut, Copy or Clear)
+ * @param op Operation (Delete, Cut, Copy or Clear)
  */
 void
 Editor::cut_copy (CutCopyOp op)
@@ -3692,7 +3776,7 @@ Editor::cut_copy (CutCopyOp op)
                }
        }
 
-       if ( op != Clear )  //"Delete" doesn't change copy/paste buf
+       if ( op != Delete )  //"Delete" doesn't change copy/paste buf
                cut_buffer->clear ();
 
        if (entered_marker) {
@@ -3715,110 +3799,79 @@ Editor::cut_copy (CutCopyOp op)
                switch (effective_mouse_mode()) {
                case MouseObject:
                case MouseRange:
+                       begin_reversible_command (opname + ' ' + X_("MIDI"));
                        cut_copy_midi (op);
+                       commit_reversible_command ();
                        break;
                default:
                        break;
                }
 
-       } else {
-
-       RegionSelection rs; 
-
-       /* we only want to cut regions if some are selected */
-
-       if (!selection->regions.empty()) {
-               rs = selection->regions;
+               return;
        }
 
-       switch (effective_mouse_mode()) {
-/*
- *             case MouseGain: {
-                       //find regions's gain line
-                       AudioRegionView *rview = dynamic_cast<AudioRegionView*>(clicked_regionview);
-                               AutomationTimeAxisView *tview = dynamic_cast<AutomationTimeAxisView*>(clicked_trackview);
-                       if (rview) {
-                               AudioRegionGainLine *line = rview->get_gain_line();
-                               if (!line) break;
-                               
-                               //cut region gain points in the selection
-                               AutomationList& alist (line->the_list());
-                               XMLNode &before = alist.get_state();
-                               AutomationList* what_we_got = 0;
-                               if ((what_we_got = alist.cut (selection->time.front().start - rview->audio_region()->position(), selection->time.front().end - rview->audio_region()->position())) != 0) {
-                                       session->add_command(new MementoCommand<AutomationList>(alist, &before, &alist.get_state()));
-                                       delete what_we_got;
-                                       what_we_got = 0;
-                               }
-                               
-                               rview->set_envelope_visible(true);
-                               rview->audio_region()->set_envelope_active(true);
-                               
-                       } else if (tview) {
-                               AutomationLine *line = *(tview->lines.begin());
-                               if (!line) break;
-                               
-                               //cut auto points in the selection
-                               AutomationList& alist (line->the_list());
-                               XMLNode &before = alist.get_state();
-                               AutomationList* what_we_got = 0;
-                               if ((what_we_got = alist.cut (selection->time.front().start, selection->time.front().end)) != 0) {
-                                       session->add_command(new MementoCommand<AutomationList>(alist, &before, &alist.get_state()));
-                                       delete what_we_got;
-                                       what_we_got = 0;
-                               }               
-                       } else
-                               break;
-               } break;
-*/                     
-               case MouseObject: 
-               case MouseRange:
-                       if (!rs.empty() || !selection->points.empty()) {
-                               begin_reversible_command (opname + _(" objects"));
-
-                               if (!rs.empty()) {
-                                       cut_copy_regions (op, rs);
-                                       
-                                       if (op == Cut || op == Delete) {
-                                               selection->clear_regions ();
-                                       }
-                               }
+       bool did_edit = false;
 
-                               if (!selection->points.empty()) {
-                                       cut_copy_points (op);
+       if (!selection->points.empty()) {
+               begin_reversible_command (opname + _(" points"));
+               did_edit = true;
+               cut_copy_points (op);
+               if (op == Cut || op == Delete) {
+                       selection->clear_points ();
+               }
+       } else if (!selection->regions.empty() || !selection->points.empty()) {
 
-                                       if (op == Cut || op == Delete) {
-                                               selection->clear_points ();
-                                       }
-                               }
+               string thing_name;
 
-                               commit_reversible_command ();   
-                               break;
-                       } 
+               if (selection->regions.empty()) {
+                       thing_name = _("points");
+               } else if (selection->points.empty()) {
+                       thing_name = _("regions");
+               } else {
+                       thing_name = _("objects");
+               }
+       
+               begin_reversible_command (opname + ' ' + thing_name);
+               did_edit = true;
+
+               if (!selection->regions.empty()) {
+                       cut_copy_regions (op, selection->regions);
                        
-                       if (selection->time.empty()) {
-                               framepos_t start, end;
-                               if (!get_edit_op_range (start, end)) {
-                                       return;
-                               }
-                               selection->set (start, end);
+                       if (op == Cut || op == Delete) {
+                               selection->clear_regions ();
                        }
-                               
-                       begin_reversible_command (opname + _(" range"));
-                       cut_copy_ranges (op);
-                       commit_reversible_command ();
+               }
+               
+               if (!selection->points.empty()) {
+                       cut_copy_points (op);
                        
                        if (op == Cut || op == Delete) {
-                               selection->clear_time ();
+                               selection->clear_points ();
                        }
+               }
+       } else if (selection->time.empty()) {
+               framepos_t start, end;
+               /* no time selection, see if we can get an edit range
+                  and use that.
+               */
+               if (get_edit_op_range (start, end)) {
+                       selection->set (start, end);
+               }
+       } else if (!selection->time.empty()) {
+               begin_reversible_command (opname + _(" range"));
 
-                       break;
-                       
-               default:
-                       break;
+               did_edit = true;
+               cut_copy_ranges (op);
+               
+               if (op == Cut || op == Delete) {
+                       selection->clear_time ();
                }
        }
-
+       
+       if (did_edit) {
+               commit_reversible_command ();   
+       }
+       
        if (op == Delete || op == Cut || op == Clear) {
                _drags->abort ();
        }
@@ -3946,10 +3999,11 @@ Editor::remove_clicked_region ()
 
        boost::shared_ptr<Playlist> playlist = clicked_routeview->playlist();
 
-       begin_reversible_command (_("remove region"));
        playlist->clear_changes ();
        playlist->clear_owned_changes ();
        playlist->remove_region (clicked_regionview->region());
+       if (Config->get_edit_mode() == Ripple)
+               playlist->ripple (clicked_regionview->region()->position(), -clicked_regionview->region()->length(), boost::shared_ptr<Region>());
 
        /* We might have removed regions, which alters other regions' layering_index,
           so we need to do a recursive diff here.
@@ -4012,6 +4066,9 @@ Editor::remove_selected_regions ()
                playlist->clear_owned_changes ();
                playlist->freeze ();
                playlist->remove_region (*rl);
+               if (Config->get_edit_mode() == Ripple)
+                       playlist->ripple ((*rl)->position(), -(*rl)->length(), boost::shared_ptr<Region>());
+
        }
 
        vector<boost::shared_ptr<Playlist> >::iterator pl;
@@ -4141,12 +4198,16 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs)
                switch (op) {
                case Delete:
                        pl->remove_region (r);
+                       if (Config->get_edit_mode() == Ripple)
+                               pl->ripple (r->position(), -r->length(), boost::shared_ptr<Region>());
                        break;
                        
                case Cut:
                        _xx = RegionFactory::create (r);
                        npl->add_region (_xx, r->position() - first_position);
                        pl->remove_region (r);
+                       if (Config->get_edit_mode() == Ripple)
+                               pl->ripple (r->position(), -r->length(), boost::shared_ptr<Region>());
                        break;
 
                case Copy:
@@ -4155,7 +4216,9 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs)
                        break;
 
                case Clear:
-                       pl->remove_region (r);  
+                       pl->remove_region (r);
+                       if (Config->get_edit_mode() == Ripple)
+                               pl->ripple (r->position(), -r->length(), boost::shared_ptr<Region>());
                        break;
                }
 
@@ -4704,7 +4767,7 @@ Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv
        vector<Evoral::Sequence<Evoral::MusicalTime>::Notes> v;
        v.push_back (selected);
 
-       framepos_t pos_frames = mrv.midi_region()->position();
+       framepos_t pos_frames = mrv.midi_region()->position() - mrv.midi_region()->start();
        double     pos_beats  = _session->tempo_map().framewalk_to_beats(0, pos_frames);
 
        return op (mrv.midi_region()->model(), pos_beats, v);
@@ -4764,12 +4827,17 @@ Editor::fork_region ()
                MidiRegionView* const mrv = dynamic_cast<MidiRegionView*>(*r);
 
                if (mrv) {
-                       boost::shared_ptr<Playlist> playlist = mrv->region()->playlist();
-                       boost::shared_ptr<MidiRegion> newregion = mrv->midi_region()->clone ();
-
-                       playlist->clear_changes ();
-                       playlist->replace_region (mrv->region(), newregion, mrv->region()->position());
-                       _session->add_command(new StatefulDiffCommand (playlist));
+                       try {
+                               boost::shared_ptr<Playlist> playlist = mrv->region()->playlist();
+                               boost::shared_ptr<MidiSource> new_source = _session->create_midi_source_by_stealing_name (mrv->midi_view()->track());
+                               boost::shared_ptr<MidiRegion> newregion = mrv->midi_region()->clone (new_source);
+                               
+                               playlist->clear_changes ();
+                               playlist->replace_region (mrv->region(), newregion, mrv->region()->position());
+                               _session->add_command(new StatefulDiffCommand (playlist));
+                       } catch (...) {
+                               error << string_compose (_("Could not unlink %1"), mrv->region()->name()) << endmsg;
+                       }
                }
 
                r = tmp;
@@ -5192,6 +5260,22 @@ Editor::toggle_solo_isolate ()
 {
 }
 
+
+void
+Editor::fade_range ()
+{
+       TrackViewList ts = selection->tracks.filter_to_unique_playlists ();
+
+       begin_reversible_command (_("fade range"));
+
+       for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) {
+               (*i)->fade_range (selection->time);
+       }
+
+       commit_reversible_command ();
+}
+
+
 void
 Editor::set_fade_length (bool in)
 {
@@ -5495,7 +5579,7 @@ Editor::set_playhead_cursor ()
                }
        }
 
-       if ( Config->get_always_play_range() )
+       if ( Config->get_follow_edits() )
                cancel_time_selection();
 }
 
@@ -5520,7 +5604,7 @@ Editor::split_region ()
 
 struct EditorOrderRouteSorter {
     bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
-           return a->order_key (EditorSort) < b->order_key (EditorSort);
+           return a->order_key () < b->order_key ();
     }
 };
 
@@ -5553,7 +5637,7 @@ Editor::select_next_route()
 
        selection->set(current);
 
-       ensure_track_visible(current);
+       ensure_time_axis_view_is_visible (*current);
 }
 
 void
@@ -5584,37 +5668,7 @@ Editor::select_prev_route()
 
        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();
-
-       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() - vertical_adjustment.get_page_size();
-       }
-
-       vertical_adjustment.set_value(new_value);
+       ensure_time_axis_view_is_visible (*current);
 }
 
 void
@@ -6441,12 +6495,13 @@ Editor::remove_tracks ()
 
        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++;
-                       }
+               if (!rtv) {
+                       continue;
+               }
+               if (rtv->is_track()) {
+                       ntracks++;
+               } else {
+                       nbusses++;
                }
                routes.push_back (rtv->_route);
 
@@ -6527,8 +6582,11 @@ edit your ardour.rc file to set the\n\
                return;
        }
 
-       for (vector<boost::shared_ptr<Route> >::iterator x = routes.begin(); x != routes.end(); ++x) {
-               _session->remove_route (*x);
+       {
+               Session::StateProtector sp (_session);
+               for (vector<boost::shared_ptr<Route> >::iterator x = routes.begin(); x != routes.end(); ++x) {
+                       _session->remove_route (*x);
+               }
        }
 }
 
@@ -6730,7 +6788,13 @@ Editor::fit_tracks (TrackViewList & tracks)
                ++visible_tracks;
        }
 
-       uint32_t h = (uint32_t) floor ((_visible_canvas_height - child_heights) / visible_tracks);
+       /* compute the per-track height from:
+
+          total canvas visible height - 
+                 height that will be taken by visible children of selected
+                 tracks - height of the ruler/hscroll area 
+       */
+       uint32_t h = (uint32_t) floor ((_visible_canvas_height - (child_heights + _trackview_group->canvas_origin().y)) / visible_tracks);
        double first_y_pos = DBL_MAX;
 
        if (h < TimeAxisView::preset_height (HeightSmall)) {
@@ -6753,8 +6817,6 @@ Editor::fit_tracks (TrackViewList & tracks)
                }
        }
 
-       /* 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 (all.front());
        bool next_is_selected;
@@ -6968,3 +7030,83 @@ Editor::toggle_midi_input_active (bool flip_others)
        
        _session->set_exclusive_input_active (rl, onoff, flip_others);
 }
+
+void
+Editor::lock ()
+{
+       if (!lock_dialog) {
+               lock_dialog = new Gtk::Dialog (string_compose (_("%1: Locked"), PROGRAM_NAME), true);
+
+               Gtk::Image* padlock = manage (new Gtk::Image (ARDOUR_UI_UTILS::get_icon ("padlock_closed")));
+               lock_dialog->get_vbox()->pack_start (*padlock);
+
+               ArdourButton* b = manage (new ArdourButton);
+               b->set_name ("lock button");
+               b->set_markup (string_compose ("<span size=\"large\" weight=\"bold\">%1</span>", _("Click to unlock")));
+               b->signal_clicked.connect (sigc::mem_fun (*this, &Editor::unlock));
+               lock_dialog->get_vbox()->pack_start (*b);
+               
+               lock_dialog->get_vbox()->show_all ();
+               lock_dialog->set_size_request (200, 200);
+       }
+       
+#ifdef __APPLE__
+       /* The global menu bar continues to be accessible to applications
+          with modal dialogs, which means that we need to desensitize
+          all items in the menu bar. Since those items are really just
+          proxies for actions, that means disabling all actions.
+       */
+       ActionManager::disable_all_actions ();
+#endif
+       lock_dialog->present ();
+}
+
+void
+Editor::unlock ()
+{
+       lock_dialog->hide ();
+       
+#ifdef __APPLE__
+       ActionManager::pop_action_state ();
+#endif 
+
+       if (ARDOUR_UI::config()->get_lock_gui_after_seconds()) {
+               start_lock_event_timing ();
+       }
+}
+
+void
+Editor::bring_in_callback (Gtk::Label* label, uint32_t n, uint32_t total, string name)
+{
+       Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&Editor::update_bring_in_message, this, label, n, total, name));
+}
+
+void
+Editor::update_bring_in_message (Gtk::Label* label, uint32_t n, uint32_t total, string name)
+{
+       label->set_text (string_compose ("Copying %1, %2 of %3", name, n, total));
+       Gtkmm2ext::UI::instance()->flush_pending ();
+}
+
+void
+Editor::bring_all_sources_into_session ()
+{
+       if (!_session) {
+               return;
+       }
+
+       Gtk::Label msg;
+       ArdourDialog w (_("Moving embedded files into session folder"));
+       w.get_vbox()->pack_start (msg);
+       w.present ();
+       
+       /* flush all pending GUI events because we're about to start copying
+        * files
+        */
+       
+       Gtkmm2ext::UI::instance()->flush_pending ();
+
+       cerr << " Do it\n";
+
+       _session->bring_all_sources_into_session (boost::bind (&Editor::bring_in_callback, this, &msg, _1, _2, _3));
+}