mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

AudioPlayHead: Move HostTimeNs out of AudioProcessor, to consolidate timing information

Browse source
This commit is contained in:
reuk 2022-06-13 20:25:18 +01:00
parent 8fbd99c424
commit 752c913cd2
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
13 changed files with 107 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

47
modules/juce_audio_utils/players/juce_AudioProcessorPlayer.cpp
View file

@ -171,6 +171,8 @@ void AudioProcessorPlayer::setProcessor (AudioProcessor* const processorToPlay)
if (processor == processorToPlay)
return;
sampleCount = 0;
if (processorToPlay != nullptr && sampleRate > 0 && blockSize > 0)
{
defaultProcessorChannels = NumChannels { processorToPlay->getBusesLayout() };
@ -267,15 +269,48 @@ void AudioProcessorPlayer::audioDeviceIOCallbackWithContext (const float** const
const ScopedLock sl2 (processor->getCallbackLock());
processor->setHostTimeNanos (context.hostTimeNs != nullptr ? makeOptional (*context.hostTimeNs) : nullopt);
struct AtEndOfScope
class PlayHead : private AudioPlayHead
{
~AtEndOfScope() { proc.setHostTimeNanos (nullopt); }
AudioProcessor& proc;
public:
PlayHead (AudioProcessor& proc,
Optional<uint64_t> hostTimeIn,
uint64_t sampleCountIn,
double sampleRateIn)
: processor (proc),
hostTimeNs (hostTimeIn),
sampleCount (sampleCountIn),
seconds ((double) sampleCountIn / sampleRateIn)
{
processor.setPlayHead (this);
}
~PlayHead() override
{
processor.setPlayHead (nullptr);
}
private:
Optional<PositionInfo> getPosition() const override
{
PositionInfo info;
info.setHostTimeNs (hostTimeNs);
info.setTimeInSamples ((int64_t) sampleCount);
info.setTimeInSeconds (seconds);
return info;
}
AudioProcessor& processor;
Optional<uint64_t> hostTimeNs;
uint64_t sampleCount;
double seconds;
};
const AtEndOfScope scope { *processor };
PlayHead playHead { *processor,
context.hostTimeNs != nullptr ? makeOptional (*context.hostTimeNs) : nullopt,
sampleCount,
sampleRate };
sampleCount += (uint64_t) numSamples;
if (! processor->isSuspended())
{

1
modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h
View file

@ -137,6 +137,7 @@ private:
MidiBuffer incomingMidi;
MidiMessageCollector messageCollector;
MidiOutput* midiOutput = nullptr;
uint64_t sampleCount = 0;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioProcessorPlayer)
};