fix merge conflicts from master

[ardour.git] / gtk2_ardour / editor_cursors.cc

diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index 2353481daf1305e530cda2aad2955469a2cf7894..557120c1db783b54fcd799816ab6d2fe8549c56b 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
@@ -15,91 +15,95 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
 #include <cmath>
 
-#include <libgnomecanvas/libgnomecanvas.h>
+#include "canvas/canvas.h"
+#include "canvas/debug.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, const string& color, 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)
+       , _time_bars_canvas_item (_editor._time_bars_canvas->root ())
+       , _track_canvas_item (_editor._track_canvas->root ())
+       , _length (1.0)
 {
+       CANVAS_DEBUG_NAME ((&_time_bars_canvas_item), "timebars editor cursor");
+       CANVAS_DEBUG_NAME ((&_track_canvas_item), "track canvas editor cursor");
+
+       _time_bars_canvas_item.set_show_head (0, true);
+       _time_bars_canvas_item.set_head_height (0, 9);
+       _time_bars_canvas_item.set_head_width (0, 16);
+       _time_bars_canvas_item.set_head_outward (0, false);
+       _time_bars_canvas_item.set_show_head (1, false); // head only
+       _time_bars_canvas_item.set_outline_width (0.5);
+
+       _time_bars_canvas_item.set_data ("cursor", this);
+       _track_canvas_item.set_data ("cursor", this);
+       _track_canvas_item.set_outline_width (0.5);
+
+       _time_bars_canvas_item.Event.connect (sigc::bind (sigc::mem_fun (ed, callbck), &_time_bars_canvas_item));
+       _track_canvas_item.Event.connect (sigc::bind (sigc::mem_fun (ed, callbck), &_track_canvas_item));
+
+       _time_bars_canvas_item.set_y1 (ArdourCanvas::COORD_MAX);
+       _track_canvas_item.set_y1 (ArdourCanvas::COORD_MAX);
        
-       /* "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_fill_color() = color; //.c_str());
-       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 */
+       _current_frame = 1; /* force redraw at 0 */
 }
 
-Editor::Cursor::~Cursor ()
-
+EditorCursor::~EditorCursor ()
 {
+       
 }
 
 void
-Editor::Cursor::set_position (jack_nframes_t frame)
+EditorCursor::set_position (framepos_t frame)
 {
-       double new_pos =  editor.frame_to_unit (frame);
-
-       if (editor.session == 0) {
-               canvas_item.hide();
-       } else {
-               canvas_item.show();
-       }
-
-       current_frame = frame;
+       PositionChanged (frame);
 
-       if (new_pos != points.front().get_x()) {
+       /* See Cairo FAQ question on single pixel lines to understand
+          why we add 0.5
+       */
 
-               points.front().set_x (new_pos);
-               points.back().set_x (new_pos);
+       double const new_pos = _editor.sample_to_pixel (frame) + 0.5;
 
-               canvas_item.property_points() = points;
+       if (new_pos != _time_bars_canvas_item.x ()) {
+               _time_bars_canvas_item.set_x (new_pos);
+       }
 
-               ArdourCanvas::Points p = canvas_item.property_points();
+       if (new_pos != _track_canvas_item.x0 ()) {
+               _track_canvas_item.set_x (new_pos, new_pos);
        }
+       
+       _current_frame = frame;
+}
 
-       canvas_item.raise_to_top();
+void
+EditorCursor::show ()
+{
+       _time_bars_canvas_item.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;
+       _time_bars_canvas_item.hide ();
+       _track_canvas_item.hide ();
 }
 
-void 
-Editor::Cursor::set_y_axis (double position)
+void
+EditorCursor::set_color (ArdourCanvas::Color color)
 {
-        points.front().set_y (position);
-       points.back().set_y (position + length);
-       canvas_item.property_points() = points;
+       _time_bars_canvas_item.set_color (color);
+       _track_canvas_item.set_outline_color (color);
 }