X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_cursors.cc;h=ccacda210f01484f5342e381e7248e34aeb0e423;hb=a936e9669390c4f272db75fa94817d4ae1a133a2;hp=0d5c3da667ea40387566a5bb11cf310b300eb896;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index 0d5c3da667..ccacda210f 100644
--- a/gtk2_ardour/editor_cursors.cc
+++ b/gtk2_ardour/editor_cursors.cc
@@ -23,9 +23,9 @@
 #include <libgnomecanvas/libgnomecanvas.h>
 
 #include "utils.h"
+#include "editor_cursors.h"
 #include "editor.h"
 
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
@@ -47,7 +47,7 @@ EditorCursor::EditorCursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,Ardour
 	canvas_item.property_arrow_shape_c() = 9.0;
 
 	canvas_item.set_data ("cursor", this);
-	canvas_item.signal_event().connect (bind (mem_fun (ed, callbck), &canvas_item));
+	canvas_item.signal_event().connect (sigc::bind (sigc::mem_fun (ed, callbck), &canvas_item));
 	current_frame = 1; /* force redraw at 0 */
 }
 
@@ -57,7 +57,7 @@ EditorCursor::~EditorCursor ()
 }
 
 void
-EditorCursor::set_position (nframes64_t frame)
+EditorCursor::set_position (framepos_t frame)
 {
 	PositionChanged (frame);
 
@@ -84,7 +84,7 @@ EditorCursor::set_length (double units)
 void
 EditorCursor::set_y_axis (double position)
 {
-        points.front().set_y (position);
+	points.front().set_y (position);
 	points.back().set_y (position + length);
 	canvas_item.property_points() = points;
 }