diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-10-30 23:21:42 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-11-11 03:37:08 +1100 |
| commit | 0e867b544b6d1b5f82f46cec7171998b2f2ca3bc (patch) | |
| tree | cc9605fbd8ed505aedb3e1d04cfa301a84ad8b33 /gtk2_ardour/editor_markers.cc | |
| parent | ae63243bf3af8ab4dad8535ac2811df399c9a34a (diff) | |
Refactor tempo api, include quarter-note distance in frames method.
- moves frame rounding up to TempoMap, which is needed
in order to calculate pulse distance without frame rounding.
- the time unit for tempo is still minute, but this now also
applies to meter sections. (new audio locked meter sections no
longer require a frame position).
- there is no longer a discontinuity
in the pulse for audio-locked meter/tempi.
- temporarily add debugging output in Region::set_position()
to test for region beat not matching region frame.
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index d20404916a..351ba31126 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -1394,10 +1394,9 @@ Editor::toggle_marker_lock_style () const Meter meter (msp->divisions_per_bar(), msp->note_divisor()); const Timecode::BBT_Time bbt (msp->bbt()); - const framepos_t frame = msp->frame(); const PositionLockStyle pls = (msp->position_lock_style() == AudioTime) ? MusicTime : AudioTime; - _session->tempo_map().replace_meter (*msp, meter, bbt, frame, pls); + _session->tempo_map().replace_meter (*msp, meter, bbt, pls); XMLNode &after = _session->tempo_map().get_state(); _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after)); |