X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_cursors.cc;h=ccacda210f01484f5342e381e7248e34aeb0e423;hb=fdbb9d240d870dd7ddf9c04dcfe5b1d5c7211639;hp=edd300c67c5cef045f2ae3b2264b1ca39fff30f4;hpb=14d43ca9fe28a8309b4a52fa85e2b0c64a92248b;p=ardour.git

diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index edd300c67c..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,98 +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, GtkSignalFunc callbck)
-	: editor (ed), callback (callbck), length(1.0)
+EditorCursor::EditorCursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
+	: editor (ed),
+	  canvas_item (*editor.cursor_group),
+	  length(1.0)
 {
-	GnomeCanvasGroup *group;
-	points = gnome_canvas_points_new (2);
-	
-	/* "randomly" initialize coords */
-
-	points->coords[0] = -9383839.0;
-	points->coords[1] = 0.0;
-	points->coords[2] = 1.0;
-	points->coords[3] = 0.0;
-
-	group = GNOME_CANVAS_GROUP (editor.cursor_group);
-
-	// cerr << "set cursor points, nc = " << points->num_points << endl;
-	canvas_item = gnome_canvas_item_new (group,
-					   gnome_canvas_line_get_type(),
-					   "points", points,
-					   "fill_color", color.c_str(),
-					   "width_pixels", 1,
-					   "first_arrowhead", (gboolean) TRUE,
-					   "last_arrowhead", (gboolean) TRUE,
-					   "arrow_shape_a", 11.0,
-					   "arrow_shape_b", 0.0,
-					   "arrow_shape_c", 9.0,
-					   NULL);
-
-	// cerr << "cursor line @ " << canvas_item << endl;
-
-	gtk_object_set_data (GTK_OBJECT(canvas_item), "cursor", this);
-	gtk_signal_connect (GTK_OBJECT(canvas_item), "event", callback, &editor);
-
+	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));
+
+	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 (sigc::bind (sigc::mem_fun (ed, callbck), &canvas_item));
 	current_frame = 1; /* force redraw at 0 */
 }
 
-Editor::Cursor::~Cursor ()
+EditorCursor::~EditorCursor ()
 
 {
-	gtk_object_destroy (GTK_OBJECT(canvas_item));
-	gnome_canvas_points_unref (points);
 }
 
 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) {
-		gnome_canvas_item_hide (canvas_item);
-	} else {
-		gnome_canvas_item_show (canvas_item);
-	}
-
-	current_frame = frame;
+	PositionChanged (frame);
 
-	if (new_pos == points->coords[0]) {
+	double new_pos =  editor.frame_to_unit (frame);
 
-		/* change in position is not visible, so just raise it */
-		
-		gnome_canvas_item_raise_to_top (canvas_item);
-		return;
-	} 
+	if (new_pos != points.front().get_x()) {
 
-	points->coords[0] = new_pos;
-	points->coords[2] = new_pos;
+		points.front().set_x (new_pos);
+		points.back().set_x (new_pos);
 
-	// cerr << "set cursor2 al points, nc = " << points->num_points << endl;
-	gnome_canvas_item_set (canvas_item, "points", points, NULL);
-	gnome_canvas_item_raise_to_top (canvas_item);
+		canvas_item.property_points() = points;
+	}
+	current_frame = frame;
 }
 
 void
-Editor::Cursor::set_length (double units)
+EditorCursor::set_length (double units)
 {
-	length = units; 
-	points->coords[3] = points->coords[1] + length;
-	// cerr << "set cursor3 al points, nc = " << points->num_points << endl;
-	gnome_canvas_item_set (canvas_item, "points", points, NULL);
+	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->coords[1] = position;
-	points->coords[3] = position + length;
-	// cerr << "set cursor4 al points, nc = " << points->num_points << endl;
-	gnome_canvas_item_set (canvas_item, "points", points, NULL);
+	points.front().set_y (position);
+	points.back().set_y (position + length);
+	canvas_item.property_points() = points;
 }