summaryrefslogtreecommitdiff
path: root/libs/ardour/ticker.cc
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2015-12-21 05:42:38 +1100
committernick_m <mainsbridge@gmail.com>2016-05-27 23:38:09 +1000
commitdbfe991cd862aa1d420c65c9808e5f4e199995ed (patch)
tree92acced1e410f7b02fc07a3a850118ca4cf21403 /libs/ardour/ticker.cc
parent0d0e458dde932965c4e283b0204b6d3011a3c90f (diff)
Tempo ramps - fix changing from const to ramp in the gui.
- also fixes some midi mouse over problems - start using replacements for frames_per_bar() frames_per_beat() etc.
Diffstat (limited to 'libs/ardour/ticker.cc')
-rw-r--r--libs/ardour/ticker.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index e02143e401..6236044499 100644
--- a/libs/ardour/ticker.cc
+++ b/libs/ardour/ticker.cc
@@ -308,7 +308,7 @@ double
MidiClockTicker::one_ppqn_in_frames (framepos_t transport_position)
{
const Tempo& current_tempo = _session->tempo_map().tempo_at (transport_position);
- double frames_per_beat = current_tempo.frames_per_beat (_session->nominal_frame_rate());
+ double frames_per_beat = _session->tempo_map().frames_per_beat_at (transport_position, _session->nominal_frame_rate());
double quarter_notes_per_beat = 4.0 / current_tempo.note_type();
double frames_per_quarter_note = frames_per_beat / quarter_notes_per_beat;