diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-13 02:46:36 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-13 02:46:36 +0000 |
| commit | e0cf3b6354e2c92a6adabe85cb6d6d3c547c287c (patch) | |
| tree | 564e24afbcdda3cf67c06b3ac71db3cb5b66023f /libs/ardour/midi_clock_slave.cc | |
| parent | 6aaf4ea17a326eb06d81b06cb83048fbdaaa8a52 (diff) | |
more fun and games with meter and the tempo map: rename Meter::beats_per_bar() to Meter::divisions_per_bar() so that its clear(er) on what it is actually returning; use Meter::divisions_per_bar() in more (all?) places that need it; fix up dragging meter marks by removing the relevant meter section from the map while we drag; operator<< for some tempo-related objects
git-svn-id: svn://localhost/ardour2/branches/3.0@10995 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_clock_slave.cc')
| -rw-r--r-- | libs/ardour/midi_clock_slave.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc index cc717d5fb4..892bc800ff 100644 --- a/libs/ardour/midi_clock_slave.cc +++ b/libs/ardour/midi_clock_slave.cc @@ -86,10 +86,7 @@ void MIDIClock_Slave::calculate_one_ppqn_in_frames_at(framepos_t time) { const Tempo& current_tempo = session->tempo_map().tempo_at(time); - const Meter& current_meter = session->tempo_map().meter_at(time); - double frames_per_beat = - current_tempo.frames_per_beat(session->frame_rate(), - current_meter); + double frames_per_beat = current_tempo.frames_per_beat(session->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; |