Some small cleanups to dragging.

git-svn-id: svn://localhost/ardour2/branches/3.0@5115 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index e58c4f642b18d70e6a445ebbeb128344bec103f2..0cd1c93e7582869c4a8754361ac8e2d046b6a9a7 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -133,8 +133,6 @@ Drag::end_grab (GdkEvent* event)
 {
        _ending = true;
        
-       bool did_drag = false;
-
        _editor->stop_canvas_autoscroll ();
 
        _item->ungrab (event ? event->button.time : 0);
@@ -145,14 +143,14 @@ Drag::end_grab (GdkEvent* event)
                finished (event);
        }
 
-       did_drag = !_first_move;
+       bool const did_drag = !_first_move;
 
        _editor->hide_verbose_canvas_cursor();
 
-       _ending = false;
-
        update_selection ();
        
+       _ending = false;
+
        return did_drag;
 }
 
@@ -253,15 +251,15 @@ RegionMoveDrag::RegionMoveDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p,
        _want_move_threshold = true;
        _copy = c;
        
-       _source_trackview = &_primary->get_time_axis_view ();
-       _source_layer = _primary->region()->layer ();
-       _dest_trackview = _source_trackview;
-       _dest_layer = _source_layer;
+       TimeAxisView* const tv = &_primary->get_time_axis_view ();
+       
+       _dest_trackview = tv;
+       _dest_layer = _primary->region()->layer ();
 
        double speed = 1;
-       RouteTimeAxisView* tv = dynamic_cast<RouteTimeAxisView*> (_source_trackview);
-       if (tv && tv->is_track()) {
-               speed = tv->get_diskstream()->speed ();
+       RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tv);
+       if (rtv && rtv->is_track()) {
+               speed = rtv->get_diskstream()->speed ();
        }
 
        _last_frame_position = static_cast<nframes64_t> (_primary->region()->position() / speed);
@@ -1274,9 +1272,7 @@ RegionCreateDrag::RegionCreateDrag (Editor* e, ArdourCanvas::Item* i, TimeAxisVi
 void
 RegionCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor *)
 {
-       _source_trackview = _view;
        _dest_trackview = _view;
-       _dest_layer = _source_layer;
        
        Drag::start_grab (event);
 }

diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index 6a1561ab708882bce6773be4e42137a0f69fd8e9..1d0a366f151946ce9aec1cff559892aa7b8992f3 100644 (file)
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -176,8 +176,6 @@ protected:
 
        bool check_possible (RouteTimeAxisView **, ARDOUR::layer_t *);
 
-       TimeAxisView* _source_trackview;
-       ARDOUR::layer_t _source_layer;
        TimeAxisView* _dest_trackview;
        ARDOUR::layer_t _dest_layer;
 
@@ -211,11 +209,7 @@ public:
 
 private:
        TimeAxisView* _view;
-
-       TimeAxisView* _source_trackview;
-       ARDOUR::layer_t _source_layer;
        TimeAxisView* _dest_trackview;
-       ARDOUR::layer_t _dest_layer;
 };
 
 /** Drag of region gain */