along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <cstdlib>
using namespace sigc;
using namespace ARDOUR;
+using namespace PBD;
using namespace Gtk;
-Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck)(GdkEvent*))
- : editor (ed), length(1.0)
+Editor::Cursor::Cursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
+ : editor (ed),
+ canvas_item (*editor.cursor_group),
+ length(1.0)
{
- /* "randomly" initialize coords */
- points.push_back (Gnome::Art::Point (-9383839.0, 0.0));
- points.push_back (Gnome::Art::Point (1.0, 0.0));
+ /* "randomly" initialize coords */
- canvas_item = new Gnome::Canvas::Line (editor.cursor_group);
- canvas_item->set_property ("points", points.gobj());
- canvas_item->set_property ("fill_color", color.c_str());
- canvas_item->set_property ("width_pixels", 1);
- canvas_item->set_property ("first_arrowhead", (gboolean) TRUE);
- canvas_item->set_property ("last_arrowhead", (gboolean) TRUE);
- canvas_item->set_property ("arrow_shape_a", 11.0);
- canvas_item->set_property ("arrow_shape_b", 0.0);
- canvas_item->set_property ("arrow_shape_c", 9.0);
-
- canvas_item->set_data ("cursor", this);
- canvas_item->signal_event().connect (slot (ed, callback));
+ points.push_back(Gnome::Art::Point(-9383839.0, 0.0));
+ points.push_back(Gnome::Art::Point(1.0, 0.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 */
}
Editor::Cursor::~Cursor ()
{
- gtk_object_destroy (GTK_OBJECT(canvas_item));
- gnome_canvas_points_unref (points);
}
void
-Editor::Cursor::set_position (jack_nframes_t frame)
+Editor::Cursor::set_position (nframes_t frame)
{
double new_pos = editor.frame_to_unit (frame);
if (editor.session == 0) {
- gnome_canvas_item_hide (canvas_item);
+ canvas_item.hide();
} else {
- gnome_canvas_item_show (canvas_item);
+ canvas_item.show();
}
current_frame = frame;
- if (new_pos == points->coords[0]) {
+ if (new_pos != points.front().get_x()) {
+
+ points.front().set_x (new_pos);
+ points.back().set_x (new_pos);
- /* change in position is not visible, so just raise it */
-
- gnome_canvas_item_raise_to_top (canvas_item);
- return;
- }
+ canvas_item.property_points() = points;
- points->coords[0] = new_pos;
- points->coords[2] = new_pos;
+ ArdourCanvas::Points p = canvas_item.property_points();
+ }
- // 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.raise_to_top();
}
void
Editor::Cursor::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);
+ points.back().set_y (points.front().get_y() + length);
+ canvas_item.property_points() = points;
}
void
Editor::Cursor::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;
}