diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-12-14 20:28:37 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-12-14 20:28:37 +0000 |
commit | f09524b9d30115e51294edc3af4399194f8478f1 (patch) | |
tree | 7c3bb83e413f790fac39b0d7c9a7e31ae279d5d2 /libs/surfaces | |
parent | ee5a37a306babadc81ac4a2612b260dc612a381a (diff) |
move ticks per beat from Meter to Timecode::BBT_Time, add new constructor for BBT_Time based on a double value; reduce BeatFramesConverted to 1 liners pending likely removal
git-svn-id: svn://localhost/ardour2/branches/3.0@8277 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
-rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 17b013713d..ce2b2088d2 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -1068,8 +1068,8 @@ MackieControlProtocol::format_bbt_timecode (framepos_t now_frame) subdiv = 3; } - uint32_t subdivisions = bbt_time.ticks / uint32_t (Meter::ticks_per_beat / subdiv); - uint32_t ticks = bbt_time.ticks % uint32_t (Meter::ticks_per_beat / subdiv); + uint32_t subdivisions = bbt_time.ticks / uint32_t (Timecode::BBT_Time::ticks_per_beat / subdiv); + uint32_t ticks = bbt_time.ticks % uint32_t (Timecode::BBT_Time::ticks_per_beat / subdiv); os << setw(2) << setfill('0') << subdivisions + 1; os << setw(3) << setfill('0') << ticks; |