send control now has working metering, and switches back and forth between busses...

[ardour.git] / gtk2_ardour / editor_cursors.cc

diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index 239d27d4f98dd413358e755f9100cc016c083117..93743f580eb1de4c9fc136d510c037fa20b643b3 100644 (file)
--- a/gtk2_ardour/editor_cursors.cc
+++ b/gtk2_ardour/editor_cursors.cc
@@ -35,11 +35,8 @@ Editor::Cursor::Cursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanv
          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_width_pixels() = 1;
@@ -51,7 +48,6 @@ Editor::Cursor::Cursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanv
 
        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 */
 }
 
@@ -61,29 +57,18 @@ Editor::Cursor::~Cursor ()
 }
 
 void
-Editor::Cursor::set_position (nframes_t frame)
+Editor::Cursor::set_position (nframes64_t frame)
 {
        double new_pos =  editor.frame_to_unit (frame);
 
-       if (editor.session == 0) {
-               canvas_item.hide();
-       } else {
-               canvas_item.show();
-       }
-
-       current_frame = frame;
-
        if (new_pos != points.front().get_x()) {
 
                points.front().set_x (new_pos);
                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