X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=44d0154dd48ad493bd83dbaf3c9e7a5d58b6ebd8;hb=dfbc9da79aef9cc05808d29a20c6d12c5d553a80;hp=b997d3bb5d94714ece8beb2b89007162f5c4880a;hpb=2108525187a420c0090b5834c82c473a072436a9;p=ardour.git

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index b997d3bb5d..44d0154dd4 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -40,6 +40,7 @@
 
 #include "canvas/canvas.h"
 #include "canvas/item.h"
+#include "canvas/line_set.h"
 
 #include "editor.h"
 #include "marker.h"
@@ -49,7 +50,6 @@
 #include "time_axis_view.h"
 #include "ardour_ui.h"
 #include "tempo_lines.h"
-#include "utils.h"
 
 #include "i18n.h"
 
@@ -176,10 +176,10 @@ Editor::draw_measures (ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
 	}
 
 	if (tempo_lines == 0) {
-		tempo_lines = new TempoLines (*_track_canvas, time_line_group, ArdourCanvas::COORD_MAX);
+		tempo_lines = new TempoLines (time_line_group, ArdourCanvas::LineSet::Vertical);
 	}
 	
-	tempo_lines->draw (begin, end, samples_per_pixel);
+	tempo_lines->draw (begin, end);
 }
 
 void
@@ -343,41 +343,15 @@ Editor::edit_tempo_section (TempoSection* section)
 }
 
 void
-Editor::edit_tempo_marker (ArdourCanvas::Item *item)
+Editor::edit_tempo_marker (TempoMarker& tm)
 {
-	Marker* marker;
-	TempoMarker* tempo_marker;
-
-	if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
-		fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
-		/*NOTREACHED*/
-	}
-
-	if ((tempo_marker = dynamic_cast<TempoMarker*> (marker)) == 0) {
-		fatal << _("programming error: marker for tempo is not a tempo marker!") << endmsg;
-		/*NOTREACHED*/
-	}
-
-	edit_tempo_section (&tempo_marker->tempo());
+	edit_tempo_section (&tm.tempo());
 }
 
 void
-Editor::edit_meter_marker (ArdourCanvas::Item *item)
+Editor::edit_meter_marker (MeterMarker& mm)
 {
-	Marker* marker;
-	MeterMarker* meter_marker;
-
-	if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
-		fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
-		/*NOTREACHED*/
-	}
-
-	if ((meter_marker = dynamic_cast<MeterMarker*> (marker)) == 0) {
-		fatal << _("programming error: marker for meter is not a meter marker!") << endmsg;
-		/*NOTREACHED*/
-	}
-
-	edit_meter_section (&meter_marker->meter());
+	edit_meter_section (&mm.meter());
 }
 
 gint