X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=cbb3dcbdfedb287fb810bf4d7d24f3f2379ffdef;hb=f4203cce7ec0b8be13293e0a86f69693ec1cd977;hp=daf36d2d72e145cb0dac18ee2b8f7c11c17b12bb;hpb=592bfdd3f4af9463e2e6a691d7240839ba50d61d;p=ardour.git

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index daf36d2d72..cbb3dcbdfe 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -85,15 +85,15 @@ Editor::draw_metric_marks (const Metrics& metrics)
 
 		if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
 			snprintf (buf, sizeof(buf), "%g/%g", ms->divisions_per_bar(), ms->note_divisor ());
-			metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->get_MeterMarker(), buf,
+			metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->color ("meter marker"), buf,
 								 *(const_cast<MeterSection*>(ms))));
 		} else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
-			if (Config->get_allow_non_quarter_pulse()) {
+			if (ARDOUR_UI::config()->get_allow_non_quarter_pulse()) {
 				snprintf (buf, sizeof (buf), "%.2f/%.0f", ts->beats_per_minute(), ts->note_type());
 			} else {
 				snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
 			}
-			metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->get_TempoMarker(), buf,
+			metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->color ("tempo marker"), buf,
 								 *(const_cast<TempoSection*>(ts))));
 		}
 
@@ -178,8 +178,9 @@ Editor::draw_measures (ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
 	if (tempo_lines == 0) {
 		tempo_lines = new TempoLines (time_line_group, ArdourCanvas::LineSet::Vertical);
 	}
-	
-	tempo_lines->draw (begin, end);
+
+	const unsigned divisions = get_grid_beat_divisions(leftmost_frame);
+	tempo_lines->draw (begin, end, divisions, leftmost_frame, _session->frame_rate());
 }
 
 void