summaryrefslogtreecommitdiff
path: root/libs/ardour/session_time.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-01-02 23:32:33 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-01-02 23:32:33 +0000
commitf135947606e8d8374ff5567cf4bb0e0450ed3f84 (patch)
tree258246f3c710ac1a1762b8a4b00583108a62b020 /libs/ardour/session_time.cc
parent69c7dac1a1ee70c5a4053acdc9dd139c986698a2 (diff)
intermediate commit as all tempo/meter stuff starts to walk the precompute Bars|Beats list. Still have ::round_to_beat_subdivision() to fix. haven't really done any thorough testing at this point, but basic stuff seems OK
git-svn-id: svn://localhost/ardour2/branches/3.0@11131 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_time.cc')
-rw-r--r--libs/ardour/session_time.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index cf8ef084b2..bf7a43845b 100644
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -484,7 +484,8 @@ Session::jack_timebase_callback (jack_transport_state_t /*state*/,
if (_tempo_map) {
TempoMetric metric (_tempo_map->metric_at (_transport_frame));
- _tempo_map->bbt_time_with_metric (_transport_frame, bbt, metric);
+
+ _tempo_map->bbt_time (_transport_frame, bbt);
pos->bar = bbt.bars;
pos->beat = bbt.beats;