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 c86853047610c99ce5a81e7ed8aefab322b97598..93743f580eb1de4c9fc136d510c037fa20b643b3 100644 (file)
--- a/gtk2_ardour/editor_cursors.cc
+++ b/gtk2_ardour/editor_cursors.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
@@ -28,24 +27,18 @@
 
 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;
+       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;
@@ -53,11 +46,8 @@ Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck)
        canvas_item.property_arrow_shape_b() = 0.0;
        canvas_item.property_arrow_shape_c() = 9.0;
 
-       // cerr << "cursor line @ " << canvas_item << endl;
-
        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 */
 }
 
@@ -67,40 +57,25 @@ Editor::Cursor::~Cursor ()
 }
 
 void
-Editor::Cursor::set_position (jack_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()) {
 
-       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 */
-
-               canvas_item.raise_to_top();
-               return;
-       } 
-
-       points.front().set_x(new_pos);
-       points.back().set_x(new_pos);
-
-       // cerr << "set cursor2 al points, nc = " << points->num_points << endl;
-       canvas_item.property_points() = points;
-       canvas_item.raise_to_top();
+               canvas_item.property_points() = points;
+       }
+       current_frame = frame;
 }
 
 void
 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;
+       points.back().set_y (points.front().get_y() + length);
        canvas_item.property_points() = points;
 }
 
@@ -108,7 +83,6 @@ 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;
+       points.back().set_y (position + length);
        canvas_item.property_points() = points;
 }