diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-12-28 05:33:04 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:09 +1000 |
| commit | 5c6e18e6a087823e4a3719177c92238b206e3aeb (patch) | |
| tree | 25f7faefa65e630e68da70bf4378b825e7c29312 /libs/ardour/test/midi_clock_slave_test.h | |
| parent | 41c8b534b70e220b4d4b940aed8a98d9a57003ab (diff) | |
Tempo ramps - remove the concept of bars from tempo sections.
- this helps where tempo and meter have a somewhat circular
dependency.
MetricSection now has a musical position expressed in beats (a double).
MeterSection still has a bbt, but it really isn't needed as we have
enough information to discover the number of bars at a given beat without it.
TempoSection now has a hack to enable loading of legacy sessions, which will
ultimately be a lot cleaner than the current code.
Removing bars from tempo sections also allows us to place them
at arbitrary frames (implemented here).
Diffstat (limited to 'libs/ardour/test/midi_clock_slave_test.h')
| -rw-r--r-- | libs/ardour/test/midi_clock_slave_test.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/test/midi_clock_slave_test.h b/libs/ardour/test/midi_clock_slave_test.h index 392e2876e9..ba87f8892a 100644 --- a/libs/ardour/test/midi_clock_slave_test.h +++ b/libs/ardour/test/midi_clock_slave_test.h @@ -48,8 +48,8 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy { meter (4.0, 4.0) { _tempo_map = new TempoMap (FRAME_RATE); - _tempo_map->add_tempo (tempo, Timecode::BBT_Time(1, 1, 0), TempoSection::Type::Constant); - _tempo_map->add_meter (meter, Timecode::BBT_Time(1, 1, 0)); + _tempo_map->add_tempo (tempo, 0.0, TempoSection::Type::Constant); + _tempo_map->add_meter (meter, 0.0, Timecode::BBT_Time(1, 1, 0)); } // Controlling the mock object |