ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

new timeline types for AudioUnits and CoreAudioSource

Browse Source
This commit is contained in:
Paul Davis 2021-03-28 15:13:06 -06:00
parent 3170f880c2
commit 8c23d6955d
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libs/ardour/audio_unit.cc
View File

@ -1608,16 +1608,18 @@ OSStatus
AUPlugin::get_beat_and_tempo_callback (Float64* outCurrentBeat,
Float64* outCurrentTempo)
{
TempoMap& tmap (_session.tempo_map());
using namespace Temporal;
TempoMap::SharedPtr tmap (TempoMap::use());
DEBUG_TRACE (DEBUG::AudioUnitProcess, "AU calls ardour beat&tempo callback\n");
if (outCurrentBeat) {
*outCurrentBeat = tmap.quarters_at_sample (transport_sample);
DoubleableBeats db (tmap->quarters_at_sample (transport_sample));
*outCurrentBeat = db.to_double();
}
if (outCurrentTempo) {
*outCurrentTempo = tmap.tempo_at_sample (transport_sample).quarter_notes_per_minute();
*outCurrentTempo = tmap->tempo_at (transport_sample).quarter_notes_per_minute();
}
return noErr;
@ -1630,20 +1632,21 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe
UInt32* outTimeSig_Denominator,
Float64* outCurrentMeasureDownBeat)
{
TempoMap& tmap (_session.tempo_map());
using namespace Temporal;
TempoMap::SharedPtr tmap (TempoMap::use());
DEBUG_TRACE (DEBUG::AudioUnitProcess, "AU calls ardour music time location callback\n");
TempoMetric metric = tmap.metric_at (transport_sample + input_offset);
Temporal::BBT_Time bbt = _session.tempo_map().bbt_at_sample (transport_sample);
TempoMetric metric = tmap->metric_at (timepos_t (transport_sample + input_offset));
BBT_Time bbt = tmap->bbt_at (timepos_t (transport_sample));
if (outDeltaSampleOffsetToNextBeat) {
if (bbt.ticks == 0) {
/* on the beat */
*outDeltaSampleOffsetToNextBeat = 0;
} else {
double const next_beat = ceil (tmap.quarters_at_sample (transport_sample));
samplepos_t const next_beat_sample = tmap.sample_at_quarter_note (next_beat);
const Beats next_beat = tmap->quarters_at_sample (transport_sample).round_up_to_beat ();
samplepos_t const next_beat_sample = metric.tempo().sample_at (next_beat);
*outDeltaSampleOffsetToNextBeat = next_beat_sample - transport_sample;
}
@ -1653,7 +1656,7 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe
*outTimeSig_Numerator = (UInt32) lrintf (metric.meter().divisions_per_bar());
}
if (outTimeSig_Denominator) {
*outTimeSig_Denominator = (UInt32) lrintf (metric.meter().note_divisor());
*outTimeSig_Denominator = (UInt32) lrintf (metric.meter().note_value());
}
if (outCurrentMeasureDownBeat) {
@ -1667,7 +1670,8 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe
bbt.beats = 1;
bbt.ticks = 0;
*outCurrentMeasureDownBeat = tmap.quarters_at (bbt);
DoubleableBeats db = tmap->quarters_at (bbt);
*outCurrentMeasureDownBeat = db.to_double ();
}
return noErr;
@ -1681,6 +1685,8 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying,
Float64* outCycleStartBeat,
Float64* outCycleEndBeat)
{
using namespace Temporal;
const bool rolling = (transport_speed != 0);
const bool last_transport_rolling = (last_transport_speed != 0);
@ -1718,16 +1724,18 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying,
if (outCycleStartBeat || outCycleEndBeat) {
TempoMap& tmap (_session.tempo_map());
TempoMap::SharedPtr tmap (TempoMap::use());
Temporal::BBT_Time bbt;
if (outCycleStartBeat) {
*outCycleStartBeat = tmap.quarters_at_sample (loc->start());
DoubleableBeats db (tmap->quarters_at (loc->start()));
*outCycleStartBeat = db.to_double ();
}
if (outCycleEndBeat) {
*outCycleEndBeat = tmap.quarters_at_sample (loc->end());
DoubleableBeats db (tmap->quarters_at (loc->end()));
*outCycleEndBeat = db.to_double ();
}
}
}

10
libs/ardour/coreaudiosource.cc
View File

@ -86,7 +86,7 @@ CoreAudioSource::init_cafile ()
throw failed_constructor();
}
_length = af.GetNumberFrames();
_length = timecnt_t (af.GetNumberFrames());
CAStreamBasicDescription client_format (file_format);
@ -140,7 +140,7 @@ CoreAudioSource::safe_read (Sample* dst, samplepos_t start, samplecnt_t cnt, Aud
if (new_cnt == 0) {
/* EOF */
if (start+cnt == _length) {
if (start+cnt == _length.samples()) {
/* we really did hit the end */
nread = cnt;
}
@ -167,17 +167,17 @@ CoreAudioSource::read_unlocked (Sample *dst, samplepos_t start, samplecnt_t cnt)
abl.mNumberBuffers = 1;
abl.mBuffers[0].mNumberChannels = n_channels;
if (start > _length) {
if (start > _length.samples()) {
/* read starts beyond end of data, just memset to zero */
file_cnt = 0;
} else if (start + cnt > _length) {
} else if (start + cnt > _length.samples()) {
/* read ends beyond end of data, read some, memset the rest */
file_cnt = _length - start;
file_cnt = _length.samples() - start;
} else {