/*
- 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
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <cstdlib>
#include <cmath>
-#include <gtk-canvas.h>
+#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)
{
- GtkCanvasGroup *group;
- points = gtk_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 = GTK_CANVAS_GROUP (editor.cursor_group);
-
- // cerr << "set cursor points, nc = " << points->num_points << endl;
- canvas_item = gtk_canvas_item_new (group,
- gtk_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));
- gtk_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) {
- gtk_canvas_item_hide (canvas_item);
- } else {
- gtk_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 */
-
- gtk_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;
- gtk_canvas_item_set (canvas_item, "points", points, NULL);
- gtk_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;
- gtk_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;
- gtk_canvas_item_set (canvas_item, "points", points, NULL);
+ points.front().set_y (position);
+ points.back().set_y (position + length);
+ canvas_item.property_points() = points;
}