ensure that all waveviews have ALL their colors set accurately before first render

[ardour.git] / gtk2_ardour / automation_line.cc

diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index b0cc6eeea378610ab9fda5af2bff01cb607c4654..670083e0d482a917365101ab7d74eba8320a2f38 100644 (file)
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -537,7 +537,8 @@ AutomationLine::ContiguousControlPoints::compute_x_bounds (PublicEditor& e)
 
                        const framepos_t pos = e.pixel_to_sample(before_x);
                        const Meter& meter = map.meter_at (pos);
-                       const framecnt_t len = ceil(meter.frames_per_bar (map.tempo_at (pos), e.session()->frame_rate()) / 1920.0 / meter.divisions_per_bar());
+                       const framecnt_t len = ceil (meter.frames_per_bar (map.tempo_at (pos), e.session()->frame_rate())
+                                       / (Timecode::BBT_Time::ticks_per_beat * meter.divisions_per_bar()) );
                        const double one_tick_in_pixels = e.sample_to_pixel_unrounded (len);
 
                        before_x += one_tick_in_pixels;
@@ -552,7 +553,8 @@ AutomationLine::ContiguousControlPoints::compute_x_bounds (PublicEditor& e)
 
                        const framepos_t pos = e.pixel_to_sample(after_x);
                        const Meter& meter = map.meter_at (pos);
-                       const framecnt_t len = ceil(meter.frames_per_bar (map.tempo_at (pos), e.session()->frame_rate()) / 1920.0 / meter.divisions_per_bar());
+                       const framecnt_t len = ceil (meter.frames_per_bar (map.tempo_at (pos), e.session()->frame_rate())
+                                       / (Timecode::BBT_Time::ticks_per_beat * meter.divisions_per_bar()));
                        const double one_tick_in_pixels = e.sample_to_pixel_unrounded (len);
 
                        after_x -= one_tick_in_pixels;