X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_cursors.cc;h=3df7761007a09c46da17b799932c64c2403d58e8;hb=948c5d07065e862704da2d5f02207ed87ca821aa;hp=7cd897604c0f3829949968c90da23f474b9581ea;hpb=85e701880b125fc866a88236bf5bf971eaebf91b;p=ardour.git

diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index 7cd897604c..3df7761007 100644
--- a/gtk2_ardour/editor_cursors.cc
+++ b/gtk2_ardour/editor_cursors.cc
@@ -49,8 +49,8 @@ EditorCursor::EditorCursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,Ardour
 	_track_canvas_item->set_y1 (ArdourCanvas::COORD_MAX);
 
 	_track_canvas_item->set_x (0);
-	
-	_current_frame = 1; /* force redraw at 0 */
+
+	_current_sample = 1; /* force redraw at 0 */
 }
 
 EditorCursor::EditorCursor (Editor& ed)
@@ -63,10 +63,10 @@ EditorCursor::EditorCursor (Editor& ed)
 	_track_canvas_item->set_show_head (1, false);
 	_track_canvas_item->set_y1 (ArdourCanvas::COORD_MAX);
 	_track_canvas_item->set_ignore_events (true);
-	
+
 	_track_canvas_item->set_x (0);
-    
-	_current_frame = 1; /* force redraw at 0 */
+
+	_current_sample = 1; /* force redraw at 0 */
 }
 
 EditorCursor::~EditorCursor ()
@@ -75,17 +75,17 @@ EditorCursor::~EditorCursor ()
 }
 
 void
-EditorCursor::set_position (framepos_t frame)
+EditorCursor::set_position (samplepos_t sample)
 {
-	if (_current_frame != frame) { PositionChanged (frame); }
+	if (_current_sample != sample) { PositionChanged (sample); }
 
-	double const new_pos = _editor.sample_to_pixel_unrounded (frame);
+	double const new_pos = _editor.sample_to_pixel_unrounded (sample);
 
 	if (rint(new_pos) != rint(_track_canvas_item->x ())) {
-		_track_canvas_item->set_x (new_pos);
+		_track_canvas_item->set_x (new_pos-0.5);  //accommodate the 1/2 pixel "line" offset in cairo
 	}
 
-	_current_frame = frame;
+	_current_sample = sample;
 }
 
 void
@@ -101,7 +101,7 @@ EditorCursor::hide ()
 }
 
 void
-EditorCursor::set_color (ArdourCanvas::Color color)
+EditorCursor::set_color (Gtkmm2ext::Color color)
 {
 	_track_canvas_item->set_color (color);
 }