X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_drag.h;h=ce8a1370f4e63ca1ac6ce266f0e75ea1dee97443;hb=d08e3b94c5ef75ce5d4d28f3636faa8af4661e17;hp=bfd308b6f9eba0bb413cedcc78ad4c1abf2db4b7;hpb=84b4dd94e34afea47dcb6b411215d5b86f112e25;p=ardour.git diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index bfd308b6f9..ce8a1370f4 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -100,6 +100,7 @@ private: double _current_pointer_x; ///< trackview x of the current pointer double _current_pointer_y; ///< trackview y of the current pointer ARDOUR::framepos_t _current_pointer_frame; ///< frame that the pointer is now at + bool _old_follow_playhead; ///< state of Editor::follow_playhead() before the drags started }; /** Abstract base class for dragging of things within the editor */ @@ -662,7 +663,6 @@ private: Marker* _marker; ///< marker being dragged std::list _copied_locations; - ArdourCanvas::Line* _line; ArdourCanvas::Points _points; }; @@ -731,13 +731,13 @@ public: private: - ArdourCanvas::SimpleLine* _line; + ArdourCanvas::Line* _line; AudioRegionView* _arv; double _region_view_grab_x; double _cumulative_x_drag; - uint32_t _before; + float _before; uint32_t _max_x; };