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 /libs/ardour/test/midi_clock_slave_test.h | |
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 'libs/ardour/test/midi_clock_slave_test.h')
-rw-r--r-- | libs/ardour/test/midi_clock_slave_test.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/test/midi_clock_slave_test.h b/libs/ardour/test/midi_clock_slave_test.h index 7bb5e282d5..6866186d5a 100644 --- a/libs/ardour/test/midi_clock_slave_test.h +++ b/libs/ardour/test/midi_clock_slave_test.h @@ -49,7 +49,7 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy { { _tempo_map = new TempoMap (FRAME_RATE); _tempo_map->add_tempo (tempo, 0.0, 0, TempoSection::Constant, AudioTime); - _tempo_map->add_meter (meter, 0.0, Timecode::BBT_Time(1, 1, 0), 0, AudioTime); + _tempo_map->add_meter (meter, 0.0, Timecode::BBT_Time(1, 1, 0), AudioTime); } // Controlling the mock object |