fix up recent cherry-picks from waves' tracks

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index bdd93efe7dcc02c54be5a87de15895daca64989f..2fd642fb2969de389de737803468941b55103b30 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -1096,9 +1096,6 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed
        typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping;
        PlaylistMapping playlist_mapping;
 
-       typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping;
-       PlaylistMapping playlist_mapping;
-
        /* insert the regions into their new playlists */
        for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end();) {
 
@@ -1188,9 +1185,6 @@ RegionMoveDrag::finished_no_copy (
        typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping;
        PlaylistMapping playlist_mapping;
 
-       typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping;
-       PlaylistMapping playlist_mapping;
-
        for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ) {
 
                RegionView* rv = i->view;
@@ -3467,10 +3461,6 @@ MarkerDrag::motion (GdkEvent* event, bool)
 
                copy_location = x->location;
 
-               if ((type != TrimRight) && (delta < 0)) {
-                       delta = max (-((framecnt_t) earliest_start), delta);
-               }
-               
                if ((real_location = _editor->find_location_from_marker (x->markers.front(), is_start)) == 0) {
                        continue;
                }

diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index ce2ac1ca16dff4d39ee502263754d646327dfbdf..c25c24839bb0f5500be45b63ad1a48452f703857 100644 (file)
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -239,9 +239,8 @@ private:
        bool _trackview_only; ///< true if pointer y value should always be relative to the top of the trackview group
        bool _move_threshold_passed; ///< true if the move threshold has been passed, otherwise false
        bool _starting_point_passed; ///< true if we called move () with first_move flag, otherwise false
-        bool _was_double_click; ///< true if drag initiated by a double click event
        bool _initially_vertical; ///< true if after move threshold is passed we appear to be moving vertically; undefined before that
-       bool _was_double_click; ///< true if drag initiated by a double click event
+        bool _was_double_click; ///< true if drag initiated by a double click event
        double _grab_x; ///< trackview x of the grab start position
        double _grab_y; ///< y of the grab start position, possibly adjusted if _trackview_only is true
        double _last_pointer_x; ///< trackview x of the pointer last time a motion occurred