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*,ArdourCanvas::Item*))
+Editor::Cursor::Cursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
: editor (ed),
- points (2),
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));
- // cerr << "set cursor points, nc = " << points->num_points << endl;
-
- canvas_item.property_points().set_value(points);
- canvas_item.property_fill_color().set_value(color.c_str());
- canvas_item.property_width_pixels().set_value(1);
- canvas_item.property_first_arrowhead().set_value(TRUE);
- canvas_item.property_last_arrowhead().set_value(TRUE);
- canvas_item.property_arrow_shape_a().set_value(11.0);
- canvas_item.property_arrow_shape_b().set_value(0.0);
- canvas_item.property_arrow_shape_c().set_value(9.0);
-
- // cerr << "cursor line @ " << canvas_item << endl;
+ 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));
}
void
-Editor::Cursor::set_position (jack_nframes_t frame)
+Editor::Cursor::set_position (nframes_t frame)
{
double new_pos = editor.frame_to_unit (frame);
current_frame = frame;
- if (new_pos == points.front().get_x()) {
+ if (new_pos != points.front().get_x()) {
- /* change in position is not visible, so just raise it */
+ points.front().set_x (new_pos);
+ points.back().set_x (new_pos);
- canvas_item.raise_to_top();
- return;
- }
+ canvas_item.property_points() = points;
- points.front().set_x(new_pos);
- points.back().set_x(new_pos);
+ ArdourCanvas::Points p = canvas_item.property_points();
+ }
- // cerr << "set cursor2 al points, nc = " << points->num_points << endl;
- canvas_item.property_points().set_value(points);
canvas_item.raise_to_top();
}
Editor::Cursor::set_length (double units)
{
length = units;
- points.back().set_x (points.front().get_y() + length);
- // cerr << "set cursor3 al points, nc = " << points->num_points << endl;
- canvas_item.property_points().set_value(points);
+ points.back().set_y (points.front().get_y() + length);
+ canvas_item.property_points() = points;
}
void
Editor::Cursor::set_y_axis (double position)
{
points.front().set_y (position);
- points.back().set_x (position + length);
- // cerr << "set cursor4 al points, nc = " << points->num_points << endl;
- canvas_item.property_points().set_value(points);
+ points.back().set_y (position + length);
+ canvas_item.property_points() = points;
}