X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_cursors.cc;h=ccacda210f01484f5342e381e7248e34aeb0e423;hb=b691ba816f3080d0f8029beac6d0ff4c4c3a1900;hp=0725ad0d12dd94253217594110793beed4454aa9;hpb=962efaf05ed33ed12319eaf0e683df398b8bef05;p=ardour.git diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc index 0725ad0d12..ccacda210f 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 @@ -23,9 +23,9 @@ #include #include "utils.h" +#include "editor_cursors.h" #include "editor.h" -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -47,7 +47,7 @@ EditorCursor::EditorCursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,Ardour 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 */ } @@ -57,8 +57,10 @@ EditorCursor::~EditorCursor () } void -EditorCursor::set_position (nframes64_t frame) +EditorCursor::set_position (framepos_t frame) { + PositionChanged (frame); + double new_pos = editor.frame_to_unit (frame); if (new_pos != points.front().get_x()) { @@ -74,15 +76,15 @@ EditorCursor::set_position (nframes64_t frame) void EditorCursor::set_length (double units) { - length = units; + length = units; points.back().set_y (points.front().get_y() + length); canvas_item.property_points() = points; } -void +void EditorCursor::set_y_axis (double position) { - points.front().set_y (position); + points.front().set_y (position); points.back().set_y (position + length); canvas_item.property_points() = points; }