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/surfaces | |
| 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/surfaces')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 65a03f483d..7e208686ba 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -1021,7 +1021,7 @@ MackieControlProtocol::format_bbt_timecode (framepos_t now_frame) // figure out subdivisions per beat const Meter & meter = session->tempo_map().meter_at (now_frame); int subdiv = 2; - if (meter.note_divisor() == 8 && (meter.beats_per_bar() == 12.0 || meter.beats_per_bar() == 9.0 || meter.beats_per_bar() == 6.0)) { + if (meter.note_divisor() == 8 && (meter.divisions_per_bar() == 12.0 || meter.divisions_per_bar() == 9.0 || meter.divisions_per_bar() == 6.0)) { subdiv = 3; } |