goodbye toggle buttons for autoplay, autoinput, click and autoreturn; move nudge...

[ardour.git] / gtk2_ardour / editor_cursors.cc

diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index 93743f580eb1de4c9fc136d510c037fa20b643b3..ccacda210f01484f5342e381e7248e34aeb0e423 100644 (file)
--- a/gtk2_ardour/editor_cursors.cc
+++ b/gtk2_ardour/editor_cursors.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,14 +23,14 @@
 #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;
 
-Editor::Cursor::Cursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
+EditorCursor::EditorCursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
        : editor (ed),
          canvas_item (*editor.cursor_group),
          length(1.0)
@@ -47,18 +47,20 @@ Editor::Cursor::Cursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanv
        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 */
 }
 
-Editor::Cursor::~Cursor ()
+EditorCursor::~EditorCursor ()
 
 {
 }
 
 void
-Editor::Cursor::set_position (nframes64_t frame)
+EditorCursor::set_position (framepos_t frame)
 {
+       PositionChanged (frame);
+
        double new_pos =  editor.frame_to_unit (frame);
 
        if (new_pos != points.front().get_x()) {
@@ -72,17 +74,17 @@ Editor::Cursor::set_position (nframes64_t frame)
 }
 
 void
-Editor::Cursor::set_length (double units)
+EditorCursor::set_length (double units)
 {
-       length = units; 
+       length = units;
        points.back().set_y (points.front().get_y() + length);
        canvas_item.property_points() = points;
 }
 
-void 
-Editor::Cursor::set_y_axis (double position)
+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;
 }