From ee8fb7758aa01a2b64e9547f866360a4e245a80a Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 21 May 2014 19:13:58 -0400
Subject: remove timebar canvas item from markers

---
 gtk2_ardour/marker.cc | 27 +++++----------------------
 gtk2_ardour/marker.h  |  1 -
 2 files changed, 5 insertions(+), 23 deletions(-)

(limited to 'gtk2_ardour')

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 0242ab98b7..a327fe4431 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -57,7 +57,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 
 	: editor (ed)
 	, _parent (&parent)
-	, _time_bars_line (0)
 	, _track_canvas_line (0)
 	, _type (type)
 	, _selected (false)
@@ -299,7 +298,6 @@ Marker::~Marker ()
 
 	/* destroying the parent group destroys its contents, namely any polygons etc. that we added */
 	delete group;
-	delete _time_bars_line;
 	delete _track_canvas_line;
 }
 
@@ -328,29 +326,16 @@ Marker::setup_line ()
 {
 	if (_shown && (_selected || _line_shown)) {
 
-		if (_time_bars_line == 0) {
+		if (_track_canvas_line == 0) {
 
-			_time_bars_line = new ArdourCanvas::Line (editor.get_time_bars_group());
-			_time_bars_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EditPoint());
-			_time_bars_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
-			
-			_track_canvas_line = new ArdourCanvas::Line (editor.get_track_canvas_group());
+			_track_canvas_line = new ArdourCanvas::Line (editor.get_hscroll_group());
 			_track_canvas_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EditPoint());
 			_track_canvas_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
 		}
 
 		ArdourCanvas::Duple g = group->item_to_canvas (ArdourCanvas::Duple (0, 0));
-		ArdourCanvas::Duple d = _time_bars_line->canvas_to_item (ArdourCanvas::Duple (g.x + _shift, 0));
-
-                _time_bars_line->set_x0 (d.x);
-                _time_bars_line->set_x1 (d.x);
-		_time_bars_line->set_y0 (d.y);
-		_time_bars_line->set_y1 (ArdourCanvas::COORD_MAX);
-		_time_bars_line->set_outline_color (_selected ? ARDOUR_UI::config()->get_canvasvar_EditPoint() : _color);
-		_time_bars_line->raise_to_top ();
-		_time_bars_line->show ();
+		ArdourCanvas::Duple d = _track_canvas_line->canvas_to_item (ArdourCanvas::Duple (g.x + _shift, 0));
 
-                d = _track_canvas_line->canvas_to_item (ArdourCanvas::Duple (g.x + _shift, 0));
 		_track_canvas_line->set_x0 (d.x);
 		_track_canvas_line->set_x1 (d.x);
 		_track_canvas_line->set_y0 (d.y);
@@ -360,8 +345,7 @@ Marker::setup_line ()
 		_track_canvas_line->show ();
 
 	} else {
-		if (_time_bars_line) {
-			_time_bars_line->hide ();
+		if (_track_canvas_line) {
 			_track_canvas_line->hide ();
 		}
 	}
@@ -475,8 +459,7 @@ Marker::set_color_rgba (uint32_t c)
 	mark->set_fill_color (_color);
 	mark->set_outline_color (_color);
 
-	if (_time_bars_line && !_selected) {
-		_time_bars_line->set_outline_color (_color);
+	if (_track_canvas_line && !_selected) {
 		_track_canvas_line->set_outline_color (_color);
 	}
 
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index b3a85294ea..727f4bee18 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -103,7 +103,6 @@ class Marker : public sigc::trackable
 	ArdourCanvas::Polygon *mark;
         ArdourCanvas::Text *_name_item;
 	ArdourCanvas::Points *points;
-	ArdourCanvas::Line* _time_bars_line;
 	ArdourCanvas::Line* _track_canvas_line;
 	ArdourCanvas::Rectangle* _name_background;
 
-- 
cgit v1.2.3