Make menu item for Add Track/Bus/VCA dialog consistent with window title

[ardour.git] / gtk2_ardour / editor_cursors.cc

diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index 54786bcebf8c480327421f016b2a4a4d6b8afca9..40245778d5b950dfc270f540c7484c79ddf8de06 100644 (file)
--- 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
@@ -20,84 +20,94 @@
 #include <cstdlib>
 #include <cmath>
 
-#include <libgnomecanvas/libgnomecanvas.h>
+#include "canvas/canvas.h"
+#include "canvas/debug.h"
+#include "canvas/scroll_group.h"
 
-#include "utils.h"
+#include "editor_cursors.h"
 #include "editor.h"
 
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
 
-Editor::Cursor::Cursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
-       : editor (ed),
-         canvas_item (*editor.cursor_group),
-         length(1.0)
+EditorCursor::EditorCursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
+       : _editor (ed)
+       , _track_canvas_item (new ArdourCanvas::Arrow (_editor.get_cursor_scroll_group()))
 {
-       
-       /* "randomly" initialize coords */
-       
-       points.push_back(Gnome::Art::Point(-9383839.0, 0.0));
-       points.push_back(Gnome::Art::Point(1.0, 0.0));
-
-       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));
-
-       current_frame = 1; /* force redraw at 0 */
-}
+       CANVAS_DEBUG_NAME (_track_canvas_item, "track canvas editor cursor");
 
-Editor::Cursor::~Cursor ()
+       _track_canvas_item->set_show_head (0, true);
+       _track_canvas_item->set_head_height (0, 9);
+       _track_canvas_item->set_head_width (0, 16);
+       _track_canvas_item->set_head_outward (0, false);
+       _track_canvas_item->set_show_head (1, false); // head only
+       _track_canvas_item->set_data ("cursor", this);
 
-{
+       _track_canvas_item->Event.connect (sigc::bind (sigc::mem_fun (ed, callbck), _track_canvas_item));
+
+       _track_canvas_item->set_y1 (ArdourCanvas::COORD_MAX);
+
+       _track_canvas_item->set_x (0);
+
+       _current_frame = 1; /* force redraw at 0 */
 }
 
-void
-Editor::Cursor::set_position (nframes64_t frame)
+EditorCursor::EditorCursor (Editor& ed)
+       : _editor (ed)
+       , _track_canvas_item (new ArdourCanvas::Arrow (_editor.get_hscroll_group()))
 {
-       double new_pos =  editor.frame_to_unit (frame);
+       CANVAS_DEBUG_NAME (_track_canvas_item, "track canvas cursor");
 
-       if (editor.session == 0) {
-               canvas_item.hide();
-       } else {
-               canvas_item.show();
-       }
+       _track_canvas_item->set_show_head (0, false);
+       _track_canvas_item->set_show_head (1, false);
+       _track_canvas_item->set_y1 (ArdourCanvas::COORD_MAX);
+       _track_canvas_item->set_ignore_events (true);
+
+       _track_canvas_item->set_x (0);
 
-       current_frame = frame;
+       _current_frame = 1; /* force redraw at 0 */
+}
 
-       if (new_pos != points.front().get_x()) {
+EditorCursor::~EditorCursor ()
+{
+       delete _track_canvas_item;
+}
 
-               points.front().set_x (new_pos);
-               points.back().set_x (new_pos);
+void
+EditorCursor::set_position (framepos_t frame)
+{
+       if (_current_frame != frame) { PositionChanged (frame); }
 
-               canvas_item.property_points() = points;
+       double const new_pos = _editor.sample_to_pixel_unrounded (frame);
 
-               ArdourCanvas::Points p = canvas_item.property_points();
+       if (rint(new_pos) != rint(_track_canvas_item->x ())) {
+               _track_canvas_item->set_x (new_pos);
        }
 
-       canvas_item.raise_to_top();
+       _current_frame = frame;
+}
+
+void
+EditorCursor::show ()
+{
+       _track_canvas_item->show ();
 }
 
 void
-Editor::Cursor::set_length (double units)
+EditorCursor::hide ()
 {
-       length = units; 
-       points.back().set_y (points.front().get_y() + length);
-       canvas_item.property_points() = points;
+       _track_canvas_item->hide ();
 }
 
-void 
-Editor::Cursor::set_y_axis (double position)
+void
+EditorCursor::set_color (ArdourCanvas::Color color)
+{
+       _track_canvas_item->set_color (color);
+}
+
+void
+EditorCursor::set_sensitive (bool yn)
 {
-        points.front().set_y (position);
-       points.back().set_y (position + length);
-       canvas_item.property_points() = points;
+       _track_canvas_item->set_ignore_events (!yn);
 }