diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-05-27 01:44:58 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:17 +1000 |
| commit | baf8f379677d6fea53d665aaff1945ccd896a6fe (patch) | |
| tree | b5016ae67469779c173b9d1e9a0d791a878d5e46 /gtk2_ardour/automation_line.cc | |
| parent | 8f3bc6f8099d7fc3bcc7f0dc88434afa0084e35f (diff) | |
Tempo ramps - rename meter_at() -> meter_at_frame() & make the ticker slightly more efficient.
Diffstat (limited to 'gtk2_ardour/automation_line.cc')
| -rw-r--r-- | gtk2_ardour/automation_line.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 47e91021ae..cf7e10dd8a 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -546,7 +546,7 @@ AutomationLine::ContiguousControlPoints::compute_x_bounds (PublicEditor& e) before_x = line.nth (front()->view_index() - 1)->get_x(); const framepos_t pos = e.pixel_to_sample(before_x); - const Meter& meter = map.meter_at (pos); + const Meter& meter = map.meter_at_frame (pos); const framecnt_t len = ceil (meter.frames_per_bar (map.tempo_at_frame (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); @@ -562,7 +562,7 @@ AutomationLine::ContiguousControlPoints::compute_x_bounds (PublicEditor& e) after_x = line.nth (back()->view_index() + 1)->get_x(); const framepos_t pos = e.pixel_to_sample(after_x); - const Meter& meter = map.meter_at (pos); + const Meter& meter = map.meter_at_frame (pos); const framecnt_t len = ceil (meter.frames_per_bar (map.tempo_at_frame (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); |