remove line parent member from Marker, part 3

git-svn-id: svn://localhost/ardour2/branches/3.0@8361 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 14 insertions, 14 deletions

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 78c1edb8b0..c4aaed42e5 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -84,10 +84,10 @@ Editor::add_new_location (Location *location)
 	if (location->is_mark()) {
 
 		if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) {
-			lam->start = new Marker (*this, *cd_marker_group, *cursor_group, color, location->name(), Marker::Mark, location->start());
+			lam->start = new Marker (*this, *cd_marker_group, color, location->name(), Marker::Mark, location->start());
 			group = cd_marker_group;
 		} else {
-			lam->start = new Marker (*this, *marker_group, *cursor_group, color, location->name(), Marker::Mark, location->start());
+			lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start());
 			group = marker_group;
 		}
 		
@@ -96,40 +96,40 @@ Editor::add_new_location (Location *location)
 	} else if (location->is_auto_loop()) {
 		
 		// transport marker
-		lam->start = new Marker (*this, *transport_marker_group, *cursor_group, color,
+		lam->start = new Marker (*this, *transport_marker_group, color,
 					 location->name(), Marker::LoopStart, location->start());
-		lam->end   = new Marker (*this, *transport_marker_group, *cursor_group, color,
+		lam->end   = new Marker (*this, *transport_marker_group, color,
 					 location->name(), Marker::LoopEnd, location->end());
 		group = transport_marker_group;
 
 	} else if (location->is_auto_punch()) {
 		
 		// transport marker
-		lam->start = new Marker (*this, *transport_marker_group, *cursor_group, color,
+		lam->start = new Marker (*this, *transport_marker_group, color,
 					 location->name(), Marker::PunchIn, location->start());
-		lam->end   = new Marker (*this, *transport_marker_group, *cursor_group, color,
+		lam->end   = new Marker (*this, *transport_marker_group, color,
 					 location->name(), Marker::PunchOut, location->end());
 		group = transport_marker_group;
 		
 	} else if (location->is_session_range()) {
 
 		// session range
-		lam->start = new Marker (*this, *marker_group, *cursor_group, color, _("start"), Marker::SessionStart, location->start());
-		lam->end = new Marker (*this, *marker_group, *cursor_group, color, _("end"), Marker::SessionEnd, location->end());
+		lam->start = new Marker (*this, *marker_group, color, _("start"), Marker::SessionStart, location->start());
+		lam->end = new Marker (*this, *marker_group, color, _("end"), Marker::SessionEnd, location->end());
 		group = marker_group;
 		
 	} else {
 		// range marker
 		if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) {
-			lam->start = new Marker (*this, *cd_marker_group, *cursor_group, color,
+			lam->start = new Marker (*this, *cd_marker_group, color,
 						 location->name(), Marker::RangeStart, location->start());
-			lam->end   = new Marker (*this, *cd_marker_group, *cursor_group, color,
+			lam->end   = new Marker (*this, *cd_marker_group, color,
 						 location->name(), Marker::RangeEnd, location->end());
 			group = cd_marker_group;
 		} else {
-			lam->start = new Marker (*this, *range_marker_group, *cursor_group, color,
+			lam->start = new Marker (*this, *range_marker_group, color,
 						 location->name(), Marker::RangeStart, location->start());
-			lam->end   = new Marker (*this, *range_marker_group, *cursor_group, color,
+			lam->end   = new Marker (*this, *range_marker_group, color,
 						 location->name(), Marker::RangeEnd, location->end());
 			group = range_marker_group;
 		}
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 2bbcdf0472..2e4842016a 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -85,11 +85,11 @@ Editor::draw_metric_marks (const Metrics& metrics)
 
 		if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
 			snprintf (buf, sizeof(buf), "%g/%g", ms->beats_per_bar(), ms->note_divisor ());
-			metric_marks.push_back (new MeterMarker (*this, *meter_group, *cursor_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf,
+			metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf,
 								 *(const_cast<MeterSection*>(ms))));
 		} else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
 			snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
-			metric_marks.push_back (new TempoMarker (*this, *tempo_group, *cursor_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf,
+			metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf,
 								 *(const_cast<TempoSection*>(ts))));
 		}