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/session_time.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/session_time.cc')
| -rw-r--r-- | libs/ardour/session_time.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc index d9c612fbee..0543fe2d02 100644 --- a/libs/ardour/session_time.cc +++ b/libs/ardour/session_time.cc @@ -492,7 +492,7 @@ Session::jack_timebase_callback (jack_transport_state_t /*state*/, // XXX still need to set bar_start_tick - pos->beats_per_bar = metric.meter().beats_per_bar(); + pos->beats_per_bar = metric.meter().divisions_per_bar(); pos->beat_type = metric.meter().note_divisor(); pos->ticks_per_beat = Timecode::BBT_Time::ticks_per_beat; pos->beats_per_minute = metric.tempo().beats_per_minute(); |