Merged with trunk R992.

[ardour.git] / gtk2_ardour / draginfo.h

diff --git a/gtk2_ardour/draginfo.h b/gtk2_ardour/draginfo.h
index 12458fdf3435b9f803aa31ada96f731e15ec2cae..9b56fed7aba92dfcfb57b297c326f7cab2556ba6 100644 (file)
--- a/gtk2_ardour/draginfo.h
+++ b/gtk2_ardour/draginfo.h
@@ -20,11 +20,11 @@ struct DragInfo {
     ArdourCanvas::Item* item;
     ItemType            item_type;
     void* data;
-    jack_nframes_t last_frame_position;
+    nframes_t last_frame_position;
     int32_t pointer_frame_offset;
-    jack_nframes_t grab_frame;
-    jack_nframes_t last_pointer_frame;
-    jack_nframes_t current_pointer_frame;
+    nframes_t grab_frame;
+    nframes_t last_pointer_frame;
+    nframes_t current_pointer_frame;
     double grab_x, grab_y;
     double cumulative_x_drag;
     double cumulative_y_drag;