(MERGED FROM rev 1924 on 2.0-ongoing) fix some (all? not likely) problems with dragging close to 2^32-1 frames

git-svn-id: svn://localhost/ardour2/trunk@1925 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 16 insertions, 17 deletions

diff --git a/gtk2_ardour/draginfo.h b/gtk2_ardour/draginfo.h
index 8b13961532..c38c2aaa65 100644
--- a/gtk2_ardour/draginfo.h
+++ b/gtk2_ardour/draginfo.h
@@ -40,7 +40,7 @@ struct DragInfo {
     ItemType            item_type;
     void* data;
     nframes_t last_frame_position;
-    int32_t pointer_frame_offset;
+    int64_t pointer_frame_offset;
     nframes_t grab_frame;
     nframes_t last_pointer_frame;
     nframes_t current_pointer_frame;
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 4570228742..54a9ecb440 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -1409,8 +1409,8 @@ Editor::motion_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item
 		*/
 		if (!drag_info.move_threshold_passed) {
 
-			bool x_threshold_passed =  (abs ((int) (drag_info.current_pointer_x - drag_info.grab_x)) > 4);
-			bool y_threshold_passed =  (abs ((int) (drag_info.current_pointer_y - drag_info.grab_y)) > 4);
+			bool x_threshold_passed =  (abs ((int64_t) (drag_info.current_pointer_x - drag_info.grab_x)) > 4LL);
+			bool y_threshold_passed =  (abs ((int64_t) (drag_info.current_pointer_y - drag_info.grab_y)) > 4LL);
 
 			drag_info.move_threshold_passed = (x_threshold_passed || y_threshold_passed);
 			
@@ -1669,7 +1669,7 @@ Editor::fade_in_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 	nframes_t pos;
 	nframes_t fade_length;
 
-	if ((int32_t)drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
+	if (drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
 		pos = drag_info.current_pointer_frame - drag_info.pointer_frame_offset;
 	}
 	else {
@@ -1714,7 +1714,7 @@ Editor::fade_in_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* even
 
 	if (drag_info.first_move) return;
 
-	if ((int32_t)drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
+	if (drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
 		pos = drag_info.current_pointer_frame - drag_info.pointer_frame_offset;
 	} else {
 		pos = 0;
@@ -1824,7 +1824,7 @@ Editor::fade_out_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* eve
 	nframes_t pos;
 	nframes_t fade_length;
 
-	if ((long)drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
+	if (drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
 		pos = drag_info.current_pointer_frame - drag_info.pointer_frame_offset;
 	}
 	else {
@@ -1906,7 +1906,7 @@ Editor::cursor_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 	Cursor* cursor = (Cursor *) drag_info.data;
 	nframes_t adjusted_frame;
 	
-	if ((long)drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
+	if (drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
 		adjusted_frame = drag_info.current_pointer_frame - drag_info.pointer_frame_offset;
 	}
 	else {
@@ -2022,7 +2022,7 @@ Editor::marker_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 
 
 	nframes_t newframe;
-	if (drag_info.pointer_frame_offset <= (long) drag_info.current_pointer_frame) {
+	if (drag_info.pointer_frame_offset <= drag_info.current_pointer_frame) {
 		newframe = drag_info.current_pointer_frame - drag_info.pointer_frame_offset;
 	}
 	else {
@@ -2203,7 +2203,7 @@ Editor::meter_marker_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* e
 	MeterMarker* marker = (MeterMarker *) drag_info.data;
 	nframes_t adjusted_frame;
 
-	if ((long)drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
+	if (drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
 		adjusted_frame = drag_info.current_pointer_frame - drag_info.pointer_frame_offset;
 	}
 	else {
@@ -2334,7 +2334,7 @@ Editor::tempo_marker_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* e
 	TempoMarker* marker = (TempoMarker *) drag_info.data;
 	nframes_t adjusted_frame;
 	
-	if ((long)drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
+	if (drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
 		adjusted_frame = drag_info.current_pointer_frame - drag_info.pointer_frame_offset;
 	}
 	else {
@@ -2952,14 +2952,14 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 
 	if (drag_info.move_threshold_passed) {
 
-		if ((int32_t)drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
+		if (drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
 
 			nframes_t sync_frame;
 			nframes_t sync_offset;
 			int32_t sync_dir;
 	    
 			pending_region_position = drag_info.current_pointer_frame - drag_info.pointer_frame_offset;
-	    
+			
 			sync_offset = rv->region()->sync_offset (sync_dir);
 			sync_frame = rv->region()->adjust_to_sync (pending_region_position);
 
@@ -2991,7 +2991,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 			/* now compute the canvas unit distance we need to move the regiondrag_info.last_trackview->order
 			   to make it appear at the new location.
 			*/
-	    
+
 			if (pending_region_position > drag_info.last_frame_position) {
 				x_delta = ((double) (pending_region_position - drag_info.last_frame_position) / frames_per_unit);
 			} else {
@@ -3143,7 +3143,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 				if (-x_delta > ix1) {
 					x_delta = -ix1;
 				}
-			} else if ((x_delta > 0) &&(rv->region()->last_frame() > max_frames - x_delta)) {
+			} else if ((x_delta > 0) && (rv->region()->last_frame() > max_frames - x_delta)) {
 				x_delta = max_frames - rv->region()->last_frame();
 			}
 
@@ -3761,10 +3761,9 @@ Editor::drag_selection (ArdourCanvas::Item* item, GdkEvent* event)
 	nframes_t length;
 	nframes_t pending_position;
 
-	if ((int32_t) drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
+	if (drag_info.current_pointer_frame > drag_info.pointer_frame_offset) {
 		pending_position = drag_info.current_pointer_frame - drag_info.pointer_frame_offset;
-	}
-	else {
+	} else {
 		pending_position = 0;
 	}