/*
- 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 "utils.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),
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));
+ 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_fill_color() = color; //.c_str());
canvas_item.property_width_pixels() = 1;
canvas_item.property_first_arrowhead() = TRUE;
canvas_item.property_last_arrowhead() = TRUE;
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 (nframes_t frame)
+EditorCursor::set_position (nframes64_t frame)
{
- double new_pos = editor.frame_to_unit (frame);
+ PositionChanged (frame);
- if (editor.session == 0) {
- canvas_item.hide();
- } else {
- canvas_item.show();
- }
-
- current_frame = frame;
+ double new_pos = editor.frame_to_unit (frame);
if (new_pos != points.front().get_x()) {
points.back().set_x (new_pos);
canvas_item.property_points() = points;
-
- ArdourCanvas::Points p = canvas_item.property_points();
}
-
- canvas_item.raise_to_top();
+ current_frame = frame;
}
void
-Editor::Cursor::set_length (double units)
+EditorCursor::set_length (double units)
{
- length = units;
+ 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_y (position + length);