X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_cursors.cc;h=40245778d5b950dfc270f540c7484c79ddf8de06;hb=01251e7e14bba0b4604618ccfad87361e32dac18;hp=ca00ec61d2eabe7b823a409d30d339704c54fa13;hpb=c86210a9d5bdb7b36ad58552a1f99f53d48781b3;p=ardour.git

diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index ca00ec61d2..40245778d5 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
@@ -20,78 +20,94 @@
 #include <cstdlib>
 #include <cmath>
 
-#include <libgnomecanvas/libgnomecanvas.h>
+#include "canvas/canvas.h"
+#include "canvas/debug.h"
+#include "canvas/scroll_group.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*))
-	: editor (ed),
-	  canvas_item (*editor.cursor_group),
-	  length(1.0)
+EditorCursor::EditorCursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
+	: _editor (ed)
+	, _track_canvas_item (new ArdourCanvas::Arrow (_editor.get_cursor_scroll_group()))
 {
-	
-	/* "randomly" initialize coords */
-	
-	points.push_back(Gnome::Art::Point(1.0, 0.0));
-	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 (bind (mem_fun (ed, callbck), &canvas_item));
-	current_frame = 1; /* force redraw at 0 */
+	CANVAS_DEBUG_NAME (_track_canvas_item, "track canvas editor cursor");
+
+	_track_canvas_item->set_show_head (0, true);
+	_track_canvas_item->set_head_height (0, 9);
+	_track_canvas_item->set_head_width (0, 16);
+	_track_canvas_item->set_head_outward (0, false);
+	_track_canvas_item->set_show_head (1, false); // head only
+	_track_canvas_item->set_data ("cursor", this);
+
+	_track_canvas_item->Event.connect (sigc::bind (sigc::mem_fun (ed, callbck), _track_canvas_item));
+
+	_track_canvas_item->set_y1 (ArdourCanvas::COORD_MAX);
+
+	_track_canvas_item->set_x (0);
+
+	_current_frame = 1; /* force redraw at 0 */
 }
 
-Editor::Cursor::~Cursor ()
+EditorCursor::EditorCursor (Editor& ed)
+	: _editor (ed)
+	, _track_canvas_item (new ArdourCanvas::Arrow (_editor.get_hscroll_group()))
+{
+	CANVAS_DEBUG_NAME (_track_canvas_item, "track canvas cursor");
 
+	_track_canvas_item->set_show_head (0, false);
+	_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 */
+}
+
+EditorCursor::~EditorCursor ()
 {
+	delete _track_canvas_item;
 }
 
 void
-Editor::Cursor::set_position (nframes64_t frame)
+EditorCursor::set_position (framepos_t frame)
 {
-	double new_pos =  editor.frame_to_unit (frame);
+	if (_current_frame != frame) { PositionChanged (frame); }
+
+	double const new_pos = _editor.sample_to_pixel_unrounded (frame);
 
-	if (editor.session == 0) {
-		canvas_item.hide();
+	if (rint(new_pos) != rint(_track_canvas_item->x ())) {
+		_track_canvas_item->set_x (new_pos);
 	}
-	current_frame = frame;
-	if (new_pos != points.front().get_x()) {
 
-		points.front().set_x (new_pos);
-		points.back().set_x (new_pos);
+	_current_frame = frame;
+}
 
-		canvas_item.property_points() = points;
-	}
+void
+EditorCursor::show ()
+{
+	_track_canvas_item->show ();
 }
 
 void
-Editor::Cursor::set_length (double units)
+EditorCursor::hide ()
 {
-	length = units; 
-	points.back().set_y (points.front().get_y() + length);
-	canvas_item.property_points() = points;
-	if (editor.session != 0) {
-		canvas_item.show();
-	}
+	_track_canvas_item->hide ();
 }
 
-void 
-Editor::Cursor::set_y_axis (double position)
+void
+EditorCursor::set_color (ArdourCanvas::Color color)
+{
+	_track_canvas_item->set_color (color);
+}
+
+void
+EditorCursor::set_sensitive (bool yn)
 {
-        points.front().set_y (position);
-	points.back().set_y (position + length);
-	canvas_item.property_points() = points;
+	_track_canvas_item->set_ignore_events (!yn);
 }