some further debugging, just in case
[ardour.git] / gtk2_ardour / editor_drag.cc
index 09c8871c315fbd18fbe1efa12937d4697f8f43f5..dfab9f89906cf4ddc382813b4a944243ba98b56b 100644 (file)
@@ -40,6 +40,7 @@
 #include "ardour/profile.h"
 #include "ardour/region_factory.h"
 #include "ardour/session.h"
+#include "ardour/session_playlists.h"
 
 #include "canvas/canvas.h"
 #include "canvas/scroll_group.h"
@@ -628,6 +629,7 @@ RegionMotionDrag::RegionMotionDrag (Editor* e, ArdourCanvas::Item* i, RegionView
        , _pdropzone (0)
        , _ddropzone (0)
 {
+       _last_position = MusicFrame (_primary->region()->position(), 0);
        DEBUG_TRACE (DEBUG::Drags, "New RegionMotionDrag\n");
 }
 
@@ -662,6 +664,11 @@ RegionMotionDrag::compute_x_delta (GdkEvent const * event, MusicFrame* pending_r
        /* compute the amount of pointer motion in frames, and where
           the region would be if we moved it by that much.
        */
+       if (_x_constrained) {
+               *pending_region_position = _last_position;
+               return 0.0;
+       }
+
        *pending_region_position = adjusted_frame (_drags->current_pointer_frame (), event, false);
 
        framecnt_t sync_offset;
@@ -1200,6 +1207,7 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move)
                        framepos_t const x_pos_music = tmap.frame_at_quarter_note (last_qn + qn_delta);
 
                        rv->set_position (x_pos_music, 0);
+                       rv->move (0, y_delta);
                } else {
                        rv->move (x_delta, y_delta);
                }
@@ -1585,7 +1593,7 @@ RegionMoveDrag::finished_no_copy (
        PlaylistSet frozen_playlists;
        set<RouteTimeAxisView*> views_to_update;
        RouteTimeAxisView* new_time_axis_view = 0;
-       framecnt_t const drag_delta = _primary->region()->position() - _last_position.frame;
+       framecnt_t const drag_delta = _primary->region()->position() - last_position.frame;
 
        typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping;
        PlaylistMapping playlist_mapping;
@@ -1657,7 +1665,7 @@ RegionMoveDrag::finished_no_copy (
 
                        /* insert into new playlist */
                        RegionView* new_view;
-                       if (rv == _primary) {
+                       if (rv == _primary && !_x_constrained) {
                                new_view = insert_region_into_playlist (
                                        RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, last_position, last_pos_qn,
                                        modified_playlists, true
@@ -2987,6 +2995,21 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
                        if (insert_result.second) {
                                pl->freeze();
                        }
+
+                       MidiRegionView* const mrv = dynamic_cast<MidiRegionView*> (rv);
+                       /* a MRV start trim may change the source length. ensure we cover all playlists here */
+                       if (mrv && _operation == StartTrim) {
+                               vector<boost::shared_ptr<Playlist> > all_playlists;
+                               _editor->session()->playlists->get (all_playlists);
+                               for (vector<boost::shared_ptr<Playlist> >::iterator x = all_playlists.begin(); x != all_playlists.end(); ++x) {
+                                       if ((*x)->uses_source (rv->region()->source(0))) {
+                                               insert_result = _editor->motion_frozen_playlists.insert (*x);
+                                               if (insert_result.second) {
+                                                       pl->freeze();
+                                               }
+                                       }
+                               }
+                       }
                }
        }
 
@@ -3135,29 +3158,22 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred)
                if (!_editor->selection->selected (_primary)) {
                        _primary->thaw_after_trim ();
                } else {
-
-                       set<boost::shared_ptr<Playlist> > diffed_playlists;
-
                        for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
                                i->view->thaw_after_trim ();
                                i->view->enable_display (true);
-
-                               /* Trimming one region may affect others on the playlist, so we need
-                                  to get undo Commands from the whole playlist rather than just the
-                                  region.  Use diffed_playlists to make sure we don't diff a given
-                                  playlist more than once.
-                               */
-                               boost::shared_ptr<Playlist> p = i->view->region()->playlist ();
-                               if (diffed_playlists.find (p) == diffed_playlists.end()) {
-                                       vector<Command*> cmds;
-                                       p->rdiff (cmds);
-                                       _editor->session()->add_commands (cmds);
-                                       diffed_playlists.insert (p);
-                               }
                        }
                }
 
                for (set<boost::shared_ptr<Playlist> >::iterator p = _editor->motion_frozen_playlists.begin(); p != _editor->motion_frozen_playlists.end(); ++p) {
+                       /* Trimming one region may affect others on the playlist, so we need
+                          to get undo Commands from the whole playlist rather than just the
+                          region.  Use motion_frozen_playlists (a set) to make sure we don't
+                          diff a given playlist more than once.
+                       */
+
+                       vector<Command*> cmds;
+                       (*p)->rdiff (cmds);
+                       _editor->session()->add_commands (cmds);
                        (*p)->thaw ();
                }
 
@@ -3361,15 +3377,17 @@ MeterMarkerDrag::aborted (bool moved)
 TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c)
        : Drag (e, i)
        , _copy (c)
-       , _grab_bpm (0.0)
-       , before_state (0)
+       , _grab_bpm (120.0, 4.0)
+       , _grab_qn (0.0)
+       , _before_state (0)
 {
        DEBUG_TRACE (DEBUG::Drags, "New TempoMarkerDrag\n");
 
        _marker = reinterpret_cast<TempoMarker*> (_item->get_data ("marker"));
        _real_section = &_marker->tempo();
        _movable = !_real_section->initial();
-       _grab_bpm = _real_section->note_types_per_minute();
+       _grab_bpm = Tempo (_real_section->note_types_per_minute(), _real_section->note_type(), _real_section->end_note_types_per_minute());
+       _grab_qn = _real_section->pulse() * 4.0;
        assert (_marker);
 }
 
@@ -3396,6 +3414,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
        if (!_real_section->active()) {
                return;
        }
+       TempoMap& map (_editor->session()->tempo_map());
 
        if (first_move) {
 
@@ -3418,9 +3437,8 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
                swap_grab (&_marker->the_item(), 0, GDK_CURRENT_TIME);
                _marker->hide();
 
-               TempoMap& map (_editor->session()->tempo_map());
                /* get current state */
-               before_state = &map.get_state();
+               _before_state = &map.get_state();
 
                if (!_copy) {
                        _editor->begin_reversible_command (_("move tempo mark"));
@@ -3428,15 +3446,14 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
                } else {
                        const Tempo tempo (_marker->tempo());
                        const framepos_t frame = adjusted_current_frame (event) + 1;
-                       const TempoSection::Type type = _real_section->type();
 
                        _editor->begin_reversible_command (_("copy tempo mark"));
 
                        if (_real_section->position_lock_style() == MusicTime) {
                                const int32_t divisions = _editor->get_grid_music_divisions (event->button.state);
-                               _real_section = map.add_tempo (tempo, map.exact_qn_at_frame (frame, divisions), 0, type, MusicTime);
+                               _real_section = map.add_tempo (tempo, map.exact_qn_at_frame (frame, divisions), 0, MusicTime);
                        } else {
-                               _real_section = map.add_tempo (tempo, 0.0, frame, type, AudioTime);
+                               _real_section = map.add_tempo (tempo, 0.0, frame, AudioTime);
                        }
 
                        if (!_real_section) {
@@ -3446,13 +3463,19 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
                }
 
        }
+       if (ArdourKeyboard::indicates_constraint (event->button.state) && ArdourKeyboard::indicates_copy (event->button.state)) {
+               double new_bpm = max (1.5, _grab_bpm.end_note_types_per_minute() + ((grab_y() - min (-1.0, current_pointer_y())) / 5.0));
+               stringstream strs;
+               _editor->session()->tempo_map().gui_change_tempo (_real_section, Tempo (_real_section->note_types_per_minute(), _real_section->note_type(), new_bpm));
+               strs << "end:" << fixed << setprecision(3) << new_bpm;
+               show_verbose_cursor_text (strs.str());
 
-       if (ArdourKeyboard::indicates_constraint (event->button.state)) {
+       } else if (ArdourKeyboard::indicates_constraint (event->button.state)) {
                /* use vertical movement to alter tempo .. should be log */
-               double new_bpm = max (1.5, _grab_bpm + ((grab_y() - min (-1.0, current_pointer_y())) / 5.0));
+               double new_bpm = max (1.5, _grab_bpm.note_types_per_minute() + ((grab_y() - min (-1.0, current_pointer_y())) / 5.0));
                stringstream strs;
-               _editor->session()->tempo_map().gui_change_tempo (_real_section, Tempo (new_bpm, _real_section->note_type()));
-               strs << new_bpm;
+               _editor->session()->tempo_map().gui_change_tempo (_real_section, Tempo (new_bpm, _real_section->note_type(), _real_section->end_note_types_per_minute()));
+               strs << "start:" << fixed << setprecision(3) << new_bpm;
                show_verbose_cursor_text (strs.str());
 
        } else if (_movable && !_real_section->locked_to_meter()) {
@@ -3467,8 +3490,6 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
                        pf = adjusted_current_frame (event);
                }
 
-               TempoMap& map (_editor->session()->tempo_map());
-
                /* snap to beat is 1, snap to bar is -1 (sorry) */
                const int sub_num = _editor->get_grid_music_divisions (event->button.state);
 
@@ -3495,7 +3516,7 @@ TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred)
        TempoMap& map (_editor->session()->tempo_map());
 
        XMLNode &after = map.get_state();
-       _editor->session()->add_command (new MementoCommand<TempoMap>(map, before_state, &after));
+       _editor->session()->add_command (new MementoCommand<TempoMap>(map, _before_state, &after));
        _editor->commit_reversible_command ();
 
        // delete the dummy marker we used for visual representation while moving.
@@ -3509,7 +3530,7 @@ TempoMarkerDrag::aborted (bool moved)
        _marker->set_position (_marker->tempo().frame());
        if (moved) {
                TempoMap& map (_editor->session()->tempo_map());
-               map.set_state (*before_state, Stateful::current_state_version);
+               map.set_state (*_before_state, Stateful::current_state_version);
                // delete the dummy (hidden) marker we used for events while moving.
                delete _marker;
        }
@@ -3519,7 +3540,7 @@ BBTRulerDrag::BBTRulerDrag (Editor* e, ArdourCanvas::Item* i)
        : Drag (e, i)
        , _grab_qn (0.0)
        , _tempo (0)
-       , before_state (0)
+       , _before_state (0)
 {
        DEBUG_TRACE (DEBUG::Drags, "New BBTRulerDrag\n");
 
@@ -3531,18 +3552,28 @@ BBTRulerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
        Drag::start_grab (event, cursor);
        TempoMap& map (_editor->session()->tempo_map());
        _tempo = const_cast<TempoSection*> (&map.tempo_section_at_frame (raw_grab_frame()));
+       _editor->tempo_curve_selected (_tempo, true);
+
        ostringstream sstr;
+       if (_tempo->clamped()) {
+               TempoSection* prev = map.previous_tempo_section (_tempo);
+               if (prev) {
+                       _editor->tempo_curve_selected (prev, true);
+                       sstr << "end: " << fixed << setprecision(3) << prev->end_note_types_per_minute() << "\n";
+               }
+       }
 
-       sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (adjusted_current_frame (event)).note_types_per_minute() << "\n";
-       sstr << "<" << fixed << setprecision(3) << _tempo->note_types_per_minute();
+       sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute();
        show_verbose_cursor_text (sstr.str());
-       finished (event, false);
 }
 
 void
 BBTRulerDrag::setup_pointer_frame_offset ()
 {
        TempoMap& map (_editor->session()->tempo_map());
+       /* get current state */
+       _before_state = &map.get_state();
+
        const double beat_at_frame = max (0.0, map.beat_at_frame (raw_grab_frame()));
        const uint32_t divisions = _editor->get_grid_beat_divisions (0);
        double beat = 0.0;
@@ -3569,8 +3600,6 @@ BBTRulerDrag::motion (GdkEvent* event, bool first_move)
        TempoMap& map (_editor->session()->tempo_map());
 
        if (first_move) {
-               /* get current state */
-               before_state = &map.get_state();
                _editor->begin_reversible_command (_("stretch tempo"));
        }
 
@@ -3586,9 +3615,16 @@ BBTRulerDrag::motion (GdkEvent* event, bool first_move)
                /* adjust previous tempo to match pointer frame */
                _editor->session()->tempo_map().gui_stretch_tempo (_tempo, map.frame_at_quarter_note (_grab_qn), pf);
        }
+
        ostringstream sstr;
-       sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (pf).note_types_per_minute() << "\n";
-       sstr << "<" << fixed << setprecision(3) << _tempo->note_types_per_minute();
+       if (_tempo->clamped()) {
+               TempoSection* prev = map.previous_tempo_section (_tempo);
+               if (prev) {
+                       _editor->tempo_curve_selected (prev, true);
+                       sstr << "end: " << fixed << setprecision(3) << prev->end_note_types_per_minute() << "\n";
+               }
+       }
+       sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute();
        show_verbose_cursor_text (sstr.str());
 }
 
@@ -3602,18 +3638,255 @@ BBTRulerDrag::finished (GdkEvent* event, bool movement_occurred)
        TempoMap& map (_editor->session()->tempo_map());
 
        XMLNode &after = map.get_state();
-       _editor->session()->add_command(new MementoCommand<TempoMap>(map, before_state, &after));
+       _editor->session()->add_command(new MementoCommand<TempoMap>(map, _before_state, &after));
        _editor->commit_reversible_command ();
+       _editor->tempo_curve_selected (_tempo, false);
+
+       if (_tempo->clamped()) {
+               TempoSection* prev_tempo = map.previous_tempo_section (_tempo);
+               if (prev_tempo) {
+                       _editor->tempo_curve_selected (prev_tempo, false);
+               }
+       }
 }
 
 void
 BBTRulerDrag::aborted (bool moved)
 {
        if (moved) {
-               _editor->session()->tempo_map().set_state (*before_state, Stateful::current_state_version);
+               _editor->session()->tempo_map().set_state (*_before_state, Stateful::current_state_version);
+       }
+}
+
+TempoTwistDrag::TempoTwistDrag (Editor* e, ArdourCanvas::Item* i)
+       : Drag (e, i)
+       , _grab_qn (0.0)
+       , _grab_tempo (0.0)
+       , _tempo (0)
+       , _next_tempo (0)
+       , _drag_valid (true)
+       , _before_state (0)
+{
+       DEBUG_TRACE (DEBUG::Drags, "New TempoTwistDrag\n");
+
+}
+
+void
+TempoTwistDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
+{
+       Drag::start_grab (event, cursor);
+       TempoMap& map (_editor->session()->tempo_map());
+       /* get current state */
+       _before_state = &map.get_state();
+       _tempo = const_cast<TempoSection*> (&map.tempo_section_at_frame (raw_grab_frame()));
+
+       _next_tempo = map.next_tempo_section (_tempo);
+       if (_next_tempo) {
+               if (!map.next_tempo_section (_next_tempo)) {
+                       _drag_valid = false;
+                       finished (event, false);
+
+                       return;
+               }
+               _editor->tempo_curve_selected (_tempo, true);
+               _editor->tempo_curve_selected (_next_tempo, true);
+
+               ostringstream sstr;
+               sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute() << "\n";
+               sstr << "end: " << fixed << setprecision(3) << _tempo->end_note_types_per_minute() << "\n";
+               sstr << "start: " << fixed << setprecision(3) << _next_tempo->note_types_per_minute();
+               show_verbose_cursor_text (sstr.str());
+       } else {
+               _drag_valid = false;
+       }
+
+       _grab_tempo = Tempo (_tempo->note_types_per_minute(), _tempo->note_type());
+}
+
+void
+TempoTwistDrag::setup_pointer_frame_offset ()
+{
+       TempoMap& map (_editor->session()->tempo_map());
+       const double beat_at_frame = max (0.0, map.beat_at_frame (raw_grab_frame()));
+       const uint32_t divisions = _editor->get_grid_beat_divisions (0);
+       double beat = 0.0;
+
+       if (divisions > 0) {
+               beat = floor (beat_at_frame) + (floor (((beat_at_frame - floor (beat_at_frame)) * divisions)) / divisions);
+       } else {
+               /* while it makes some sense for the user to determine the division to 'grab',
+                  grabbing a bar often leads to confusing results wrt the actual tempo section being altered
+                  and the result over steep tempo curves. Use sixteenths.
+               */
+               beat = floor (beat_at_frame) + (floor (((beat_at_frame - floor (beat_at_frame)) * 4)) / 4);
+       }
+
+       _grab_qn = map.quarter_note_at_beat (beat);
+
+       _pointer_frame_offset = raw_grab_frame() - map.frame_at_quarter_note (_grab_qn);
+
+}
+
+void
+TempoTwistDrag::motion (GdkEvent* event, bool first_move)
+{
+
+       if (!_next_tempo || !_drag_valid) {
+               return;
+       }
+
+       TempoMap& map (_editor->session()->tempo_map());
+
+       if (first_move) {
+               _editor->begin_reversible_command (_("twist tempo"));
+       }
+
+       framepos_t pf;
+
+       if (_editor->snap_musical()) {
+               pf = adjusted_current_frame (event, false);
+       } else {
+               pf = adjusted_current_frame (event);
+       }
+
+       /* adjust this and the next tempi to match pointer frame */
+       double new_bpm = max (1.5, _grab_tempo.note_types_per_minute() + ((grab_y() - min (-1.0, current_pointer_y())) / 5.0));
+       _editor->session()->tempo_map().gui_twist_tempi (_tempo, new_bpm, map.frame_at_quarter_note (_grab_qn), pf);
+
+       ostringstream sstr;
+       sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute() << "\n";
+       sstr << "end: " << fixed << setprecision(3) << _tempo->end_note_types_per_minute() << "\n";
+       sstr << "start: " << fixed << setprecision(3) << _next_tempo->note_types_per_minute();
+       show_verbose_cursor_text (sstr.str());
+}
+
+void
+TempoTwistDrag::finished (GdkEvent* event, bool movement_occurred)
+{
+       TempoMap& map (_editor->session()->tempo_map());
+
+       if (!movement_occurred || !_drag_valid) {
+               return;
+       }
+
+       _editor->tempo_curve_selected (_tempo, false);
+       _editor->tempo_curve_selected (_next_tempo, false);
+
+       XMLNode &after = map.get_state();
+       _editor->session()->add_command(new MementoCommand<TempoMap>(map, _before_state, &after));
+       _editor->commit_reversible_command ();
+}
+
+void
+TempoTwistDrag::aborted (bool moved)
+{
+       if (moved) {
+               _editor->session()->tempo_map().set_state (*_before_state, Stateful::current_state_version);
        }
 }
 
+TempoEndDrag::TempoEndDrag (Editor* e, ArdourCanvas::Item* i)
+       : Drag (e, i)
+       , _grab_qn (0.0)
+       , _tempo (0)
+       , _before_state (0)
+{
+       DEBUG_TRACE (DEBUG::Drags, "New TempoEndDrag\n");
+       TempoMarker* marker = reinterpret_cast<TempoMarker*> (_item->get_data ("marker"));
+       _tempo = &marker->tempo();
+       _grab_qn = _tempo->pulse() * 4.0;
+}
+
+void
+TempoEndDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
+{
+       Drag::start_grab (event, cursor);
+       TempoMap& tmap (_editor->session()->tempo_map());
+
+       /* get current state */
+       _before_state = &tmap.get_state();
+
+
+       ostringstream sstr;
+
+       TempoSection* prev = 0;
+       if ((prev = tmap.previous_tempo_section (_tempo)) != 0) {
+               _editor->tempo_curve_selected (tmap.previous_tempo_section (_tempo), true);
+               sstr << "end: " << fixed << setprecision(3) << tmap.tempo_section_at_frame (_tempo->frame() - 1).end_note_types_per_minute() << "\n";
+       }
+
+       if (_tempo->clamped()) {
+               _editor->tempo_curve_selected (_tempo, true);
+               sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute();
+       }
+
+       show_verbose_cursor_text (sstr.str());
+}
+
+void
+TempoEndDrag::setup_pointer_frame_offset ()
+{
+       TempoMap& map (_editor->session()->tempo_map());
+
+       _pointer_frame_offset = raw_grab_frame() - map.frame_at_quarter_note (_grab_qn);
+
+}
+
+void
+TempoEndDrag::motion (GdkEvent* event, bool first_move)
+{
+       TempoMap& map (_editor->session()->tempo_map());
+
+       if (first_move) {
+               _editor->begin_reversible_command (_("stretch end tempo"));
+       }
+
+
+
+       framepos_t const pf = adjusted_current_frame (event, false);
+       map.gui_stretch_tempo_end (&map.tempo_section_at_frame (_tempo->frame() - 1), map.frame_at_quarter_note (_grab_qn), pf);
+
+       ostringstream sstr;
+       sstr << "end: " << fixed << setprecision(3) << map.tempo_section_at_frame (_tempo->frame() - 1).end_note_types_per_minute() << "\n";
+
+       if (_tempo->clamped()) {
+               sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute();
+       }
+
+       show_verbose_cursor_text (sstr.str());
+}
+
+void
+TempoEndDrag::finished (GdkEvent* event, bool movement_occurred)
+{
+       if (!movement_occurred) {
+               return;
+       }
+
+       TempoMap& tmap (_editor->session()->tempo_map());
+
+       XMLNode &after = tmap.get_state();
+       _editor->session()->add_command(new MementoCommand<TempoMap>(tmap, _before_state, &after));
+       _editor->commit_reversible_command ();
+
+       TempoSection* prev = 0;
+       if ((prev = tmap.previous_tempo_section (_tempo)) != 0) {
+               _editor->tempo_curve_selected (prev, false);
+       }
+
+       if (_tempo->clamped()) {
+               _editor->tempo_curve_selected (_tempo, false);
+
+       }
+}
+
+void
+TempoEndDrag::aborted (bool moved)
+{
+       if (moved) {
+               _editor->session()->tempo_map().set_state (*_before_state, Stateful::current_state_version);
+       }
+}
 
 CursorDrag::CursorDrag (Editor* e, EditorCursor& c, bool s)
        : Drag (e, &c.track_canvas_item(), false)
@@ -3666,6 +3939,7 @@ CursorDrag::start_grab (GdkEvent* event, Gdk::Cursor* c)
 
        _editor->snap_to_with_modifier (where, event);
        _editor->_dragging_playhead = true;
+       _editor->_control_scroll_target = where.frame;
 
        Session* s = _editor->session ();
 
@@ -5225,11 +5499,17 @@ SelectionDrag::motion (GdkEvent* event, bool first_move)
                        //( NOTE: most mouse moves don't change the selection so we can't just SET it for every mouse move; it gets clunky )
                        TrackViewList tracks_to_add;
                        TrackViewList tracks_to_remove;
+                       vector<RouteGroup*> selected_route_groups;
 
                        if (!first_move) {
                                for (TrackViewList::const_iterator i = _editor->selection->tracks.begin(); i != _editor->selection->tracks.end(); ++i) {
                                        if (!new_selection.contains (*i) && !_track_selection_at_start.contains (*i)) {
                                                tracks_to_remove.push_back (*i);
+                                       } else {
+                                               RouteGroup* rg = (*i)->route_group();
+                                               if (rg && rg->is_active() && rg->is_select()) {
+                                                       selected_route_groups.push_back (rg);
+                                               }
                                        }
                                }
                        }
@@ -5237,12 +5517,35 @@ SelectionDrag::motion (GdkEvent* event, bool first_move)
                        for (TrackViewList::const_iterator i = new_selection.begin(); i != new_selection.end(); ++i) {
                                if (!_editor->selection->tracks.contains (*i)) {
                                        tracks_to_add.push_back (*i);
+                                       RouteGroup* rg = (*i)->route_group();
+
+                                       if (rg && rg->is_active() && rg->is_select()) {
+                                               selected_route_groups.push_back (rg);
+                                       }
                                }
                        }
 
                        _editor->selection->add (tracks_to_add);
 
                        if (!tracks_to_remove.empty()) {
+
+                               /* check all these to-be-removed tracks against the
+                                * possibility that they are selected by being
+                                * in the same group as an approved track.
+                                */
+
+                               for (TrackViewList::iterator i = tracks_to_remove.begin(); i != tracks_to_remove.end(); ) {
+                                       RouteGroup* rg = (*i)->route_group();
+
+                                       if (rg && find (selected_route_groups.begin(), selected_route_groups.end(), rg) != selected_route_groups.end()) {
+                                               i = tracks_to_remove.erase (i);
+                                       } else {
+                                               ++i;
+                                       }
+                               }
+
+                               /* remove whatever is left */
+
                                _editor->selection->remove (tracks_to_remove);
                        }
                }
@@ -6392,7 +6695,10 @@ NoteCreateDrag::finished (GdkEvent* ev, bool had_movement)
        const double qn_length = map.quarter_notes_between_frames (start_sess_rel, start_sess_rel + length);
        Evoral::Beats qn_length_beats = max (Evoral::Beats::ticks(1), Evoral::Beats (qn_length));
 
+       _editor->begin_reversible_command (_("Create Note"));
+       _region_view->clear_editor_note_selection();
        _region_view->create_note_at (start, _drag_rect->y0(), qn_length_beats, ev->button.state, false);
+       _editor->commit_reversible_command ();
 }
 
 double
@@ -6413,7 +6719,7 @@ HitCreateDrag::HitCreateDrag (Editor* e, ArdourCanvas::Item* i, MidiRegionView*
        : Drag (e, i)
        , _region_view (rv)
        , _last_pos (0)
-       , _last_y (0.0)
+       , _y (0.0)
 {
 }
 
@@ -6428,6 +6734,8 @@ HitCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
 
        TempoMap& map (_editor->session()->tempo_map());
 
+       _y = _region_view->note_to_y (_region_view->y_to_note (y_to_region (event->button.y)));
+
        const framepos_t pf = _drags->current_pointer_frame ();
        const int32_t divisions = _editor->get_grid_music_divisions (event->button.state);
 
@@ -6440,14 +6748,13 @@ HitCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
        }
 
        const framepos_t start = map.frame_at_quarter_note (eqaf) - _region_view->region()->position();
-       const double y = _region_view->note_to_y (_region_view->y_to_note (y_to_region (event->button.y)));
-
        Evoral::Beats length = _region_view->get_grid_beats (pf);
 
-       _region_view->create_note_at (start, y, length, event->button.state, false);
+       _editor->begin_reversible_command (_("Create Hit"));
+       _region_view->clear_editor_note_selection();
+       _region_view->create_note_at (start, _y, length, event->button.state, false);
 
        _last_pos = start;
-       _last_y = y;
 }
 
 void
@@ -6464,28 +6771,28 @@ HitCreateDrag::motion (GdkEvent* event, bool)
 
        const double eqaf = map.exact_qn_at_frame (pf, divisions);
        const framepos_t start = map.frame_at_quarter_note (eqaf) - _region_view->region()->position ();
-       const double y = _region_view->note_to_y (_region_view->y_to_note (y_to_region (event->button.y)));
 
-       if (_last_pos == start && y == _last_y) {
+       if (_last_pos == start) {
                return;
        }
 
        Evoral::Beats length = _region_view->get_grid_beats (pf);
 
        boost::shared_ptr<MidiRegion> mr = _region_view->midi_region();
+
        if (eqaf >= mr->quarter_note() + mr->length_beats()) {
                return;
        }
 
-       _region_view->create_note_at (start, y, length, event->button.state, false);
+       _region_view->create_note_at (start, _y, length, event->button.state, false);
 
        _last_pos = start;
-       _last_y = y;
 }
 
 void
 HitCreateDrag::finished (GdkEvent* /* ev */, bool /* had_movement */)
 {
+       _editor->commit_reversible_command ();
 
 }