ardour/livetrax
13
0
Fork 0
Code

upgrade audiounit support to use the new tempomap API

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11169 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-01-05 21:26:54 +00:00
parent 9829a69549
commit c5205fe49f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/ardour/audio_unit.cc
View File

@ -1414,7 +1414,7 @@ AUPlugin::get_beat_and_tempo_callback (Float64* outCurrentBeat,
Timecode::BBT_Time bbt; Timecode::BBT_Time bbt;
TempoMetric metric = tmap.metric_at (_session.transport_frame() + input_offset); TempoMetric metric = tmap.metric_at (_session.transport_frame() + input_offset);
tmap.bbt_time_with_metric (_session.transport_frame() + input_offset, bbt, metric); tmap.bbt_time (_session.transport_frame() + input_offset, bbt);
if (outCurrentBeat) { if (outCurrentBeat) {
float beat; float beat;
@ -1453,7 +1453,7 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe
Timecode::BBT_Time bbt; Timecode::BBT_Time bbt;
TempoMetric metric = tmap.metric_at (_session.transport_frame() + input_offset); TempoMetric metric = tmap.metric_at (_session.transport_frame() + input_offset);
tmap.bbt_time_with_metric (_session.transport_frame() + input_offset, bbt, metric); tmap.bbt_time (_session.transport_frame() + input_offset, bbt);
if (outDeltaSampleOffsetToNextBeat) { if (outDeltaSampleOffsetToNextBeat) {
if (bbt.ticks == 0) { if (bbt.ticks == 0) {
@ -1462,7 +1462,7 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe
} else { } else {
*outDeltaSampleOffsetToNextBeat = (UInt32) *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_bar_division - bbt.ticks)/Timecode::BBT_Time::ticks_per_bar_division) * // fraction of a beat to next beat
metric.tempo().frames_per_beat(_session.frame_rate())); // frames per beat metric.meter().frames_per_division (metric.tempo(), _session.frame_rate())); // frames per beat
} }
} }
@ -1548,7 +1548,7 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying,
if (outCycleStartBeat) { if (outCycleStartBeat) {
TempoMetric metric = tmap.metric_at (loc->start() + input_offset); TempoMetric metric = tmap.metric_at (loc->start() + input_offset);
_session.tempo_map().bbt_time_with_metric (loc->start(), bbt, metric); _session.tempo_map().bbt_time (loc->start(), bbt);
float beat; float beat;
beat = metric.meter().divisions_per_bar() * bbt.bars; beat = metric.meter().divisions_per_bar() * bbt.bars;
@ -1560,7 +1560,7 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying,
if (outCycleEndBeat) { if (outCycleEndBeat) {
TempoMetric metric = tmap.metric_at (loc->end() + input_offset); TempoMetric metric = tmap.metric_at (loc->end() + input_offset);
_session.tempo_map().bbt_time_with_metric (loc->end(), bbt, metric); _session.tempo_map().bbt_time (loc->end(), bbt);
float beat; float beat;
beat = metric.meter().divisions_per_bar() * bbt.bars; beat = metric.meter().divisions_per_bar() * bbt.bars;