X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_cursors.cc;h=ccacda210f01484f5342e381e7248e34aeb0e423;hb=c40437430acf4b65d8acb8b084eae8cd2f6f5402;hp=3fd0a561e7204aed29e291afe59e4a93b314bf3b;hpb=bac3c6bc0f36623e200fe30fc8cc4137ab96fba7;p=ardour.git

diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index 3fd0a561e7..ccacda210f 100644
--- 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
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
@@ -24,91 +23,68 @@
 #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, const string& color, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
+EditorCursor::EditorCursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
 	: editor (ed),
-	  points (2),
 	  canvas_item (*editor.cursor_group),
 	  length(1.0)
 {
-	
-	/* "randomly" initialize coords */
+	points.push_back(Gnome::Art::Point(-1.0, 0.0)); // first x-coord needs to be a non-normal value
+	points.push_back(Gnome::Art::Point(1.0, 1.0));
 
-	points.push_back(Gnome::Art::Point(-9383839.0, 0.0));
-	points.push_back(Gnome::Art::Point(1.0, 0.0));
-
-	// cerr << "set cursor points, nc = " << points->num_points << endl;
-
-	canvas_item.property_points().set_value(points);
-	canvas_item.property_fill_color().set_value(color.c_str());
-	canvas_item.property_width_pixels().set_value(1);
-	canvas_item.property_first_arrowhead().set_value(TRUE);
-	canvas_item.property_last_arrowhead().set_value(TRUE);
-	canvas_item.property_arrow_shape_a().set_value(11.0);
-	canvas_item.property_arrow_shape_b().set_value(0.0);
-	canvas_item.property_arrow_shape_c().set_value(9.0);
-
-	// cerr << "cursor line @ " << canvas_item << endl;
+	canvas_item.property_points() = points;
+	canvas_item.property_width_pixels() = 1;
+	canvas_item.property_first_arrowhead() = TRUE;
+	canvas_item.property_last_arrowhead() = TRUE;
+	canvas_item.property_arrow_shape_a() = 11.0;
+	canvas_item.property_arrow_shape_b() = 0.0;
+	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 (jack_nframes_t frame)
+EditorCursor::set_position (framepos_t frame)
 {
-	double new_pos =  editor.frame_to_unit (frame);
-
-	if (editor.session == 0) {
-		canvas_item.hide();
-	} else {
-		canvas_item.show();
-	}
+	PositionChanged (frame);
 
-	current_frame = frame;
-
-	if (new_pos == points.front().get_x()) {
-
-		/* change in position is not visible, so just raise it */
+	double new_pos =  editor.frame_to_unit (frame);
 
-		canvas_item.raise_to_top();
-		return;
-	} 
+	if (new_pos != points.front().get_x()) {
 
-	points.front().set_x(new_pos);
-	points.back().set_x(new_pos);
+		points.front().set_x (new_pos);
+		points.back().set_x (new_pos);
 
-	// cerr << "set cursor2 al points, nc = " << points->num_points << endl;
-	canvas_item.property_points().set_value(points);
-	canvas_item.raise_to_top();
+		canvas_item.property_points() = points;
+	}
+	current_frame = frame;
 }
 
 void
-Editor::Cursor::set_length (double units)
+EditorCursor::set_length (double units)
 {
-	length = units; 
-	points.back().set_x (points.front().get_y() + length);
-	// cerr << "set cursor3 al points, nc = " << points->num_points << endl;
-	canvas_item.property_points().set_value(points);
+	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.back().set_x (position + length);
-	// cerr << "set cursor4 al points, nc = " << points->num_points << endl;
-	canvas_item.property_points().set_value(points);
+	points.front().set_y (position);
+	points.back().set_y (position + length);
+	canvas_item.property_points() = points;
 }