diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-06 16:39:40 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-06 16:39:40 +0000 |
commit | 355183f1abea75d8fab0926cd7e7130796574cb0 (patch) | |
tree | 78cc092b820fda137e752529f2d45c794c375313 /libs/ardour/audio_unit.cc | |
parent | bdb15f942250ad3e8a42c6bef927374eedb0299f (diff) |
partially revert some of the recent work on tempo to reflect new understanding of the problem. behaviour is now believed to be totally correct but awaiting a bit more testing
git-svn-id: svn://localhost/ardour2/branches/3.0@11171 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_unit.cc')
-rw-r--r-- | libs/ardour/audio_unit.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index 3b1e91c329..5932b73949 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -1420,7 +1420,7 @@ AUPlugin::get_beat_and_tempo_callback (Float64* outCurrentBeat, float beat; beat = metric.meter().divisions_per_bar() * bbt.bars; beat += bbt.beats; - beat += bbt.ticks / Timecode::BBT_Time::ticks_per_bar_division; + beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; *outCurrentBeat = beat; } @@ -1461,7 +1461,7 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe *outDeltaSampleOffsetToNextBeat = 0; } else { *outDeltaSampleOffsetToNextBeat = (UInt32) - floor (((Timecode::BBT_Time::ticks_per_bar_division - bbt.ticks)/Timecode::BBT_Time::ticks_per_bar_division) * // fraction of a beat to next beat + floor (((Timecode::BBT_Time::ticks_per_beat - bbt.ticks)/Timecode::BBT_Time::ticks_per_beat) * // fraction of a beat to next beat metric.meter().frames_per_division (metric.tempo(), _session.frame_rate())); // frames per beat } } @@ -1553,7 +1553,7 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying, float beat; beat = metric.meter().divisions_per_bar() * bbt.bars; beat += bbt.beats; - beat += bbt.ticks / Timecode::BBT_Time::ticks_per_bar_division; + beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; *outCycleStartBeat = beat; } @@ -1565,7 +1565,7 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying, float beat; beat = metric.meter().divisions_per_bar() * bbt.bars; beat += bbt.beats; - beat += bbt.ticks / Timecode::BBT_Time::ticks_per_bar_division; + beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; *outCycleEndBeat = beat; } |