fix gtk errors caused by using non-escaped paths in a column used as a tooltip (which...

[ardour.git] / gtk2_ardour / editor_drag.h

diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index e78a9fa96a4d0ff52dd91b666ff5a2c682bc0dda..196552f96a9e99fd824700513b0b519700316b1e 100644 (file)
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -682,7 +682,16 @@ private:
        void update_item (ARDOUR::Location *);
 
        Marker* _marker; ///< marker being dragged
-       std::list<ARDOUR::Location*> _copied_locations;
+
+        struct CopiedLocationMarkerInfo {
+           ARDOUR::Location* location;
+           std::vector<Marker*> markers;
+           bool    move_both;
+           CopiedLocationMarkerInfo (ARDOUR::Location* l, Marker* m);
+       };
+
+        typedef std::list<CopiedLocationMarkerInfo> CopiedLocationInfo;
+        CopiedLocationInfo _copied_locations;
        ArdourCanvas::Points _points;
 };
 
@@ -706,6 +715,8 @@ private:
        double _fixed_grab_y;
        double _cumulative_x_drag;
        double _cumulative_y_drag;
+        bool     _pushing;
+        uint32_t _final_index;
        static double _zero_gain_fraction;
 };