fix up scons check for hardware monitoring, minor error message typo

[ardour.git] / gtk2_ardour / draginfo.h

diff --git a/gtk2_ardour/draginfo.h b/gtk2_ardour/draginfo.h
index 3db8bab1e8d3febd6880fc076bec12633e2b8983..9b56fed7aba92dfcfb57b297c326f7cab2556ba6 100644 (file)
--- a/gtk2_ardour/draginfo.h
+++ b/gtk2_ardour/draginfo.h
@@ -5,6 +5,8 @@
 #include <stdint.h>
 
 #include "canvas.h"
+#include "editor_items.h"
+
 #include <ardour/types.h>
 
 namespace ARDOUR {
@@ -16,12 +18,13 @@ class TimeAxisView;
 
 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;
@@ -35,7 +38,7 @@ struct DragInfo {
     bool copy;
     bool was_rolling;
     bool first_move;
-    bool move_threshold_passsed;
+    bool move_threshold_passed;
     bool want_move_threshold;
     bool brushing;
     ARDOUR::Location* copied_location;