Add loop method to all input and outputs

Adds a virtual loop() method to the file input and audio output objects.
By default does nothing, but it can be used to prefill buffers/etc. in the
case of a buffered input, or to update a volume meter on an output, etc.

The AudioGenerators all now call it as part of their own loop()s, so there
is no user intervention required to make it work.

Thanks to @armSeb for the idea with his SPI RAM code.
This commit is contained in:
Earle F. Philhower, III committed 2017-11-24 10:35:20 -08:00
1 parent df4588197f
commit fece88a9be
10 files changed
+72 -23

No files matched your search

+9 -4
View File
@@ -75,10 +75,10 @@ bool AudioGeneratorMOD::stop()
bool AudioGeneratorMOD::loop()
{
if (!running) return false; // Easy-peasy
if (!running) goto done; // Easy-peasy
// First, try and push in the stored sample. If we can't, then punt and try later
if (!output->ConsumeSample(lastSample)) return true; // FIFO full, wait...
if (!output->ConsumeSample(lastSample)) goto done; // FIFO full, wait...
// Now advance enough times to fill the i2s buffer
do {
@@ -86,15 +86,20 @@ bool AudioGeneratorMOD::loop()
running = RunPlayer();
if (!running) {
stop();
return false;
goto done;
}
mixerTick = Player.samplesPerTick;
}
GetSample( lastSample );
mixerTick--;
} while (output->ConsumeSample(lastSample));
done:
file->loop();
output->loop();
// We'll be left with one sample still in our buffer because it couldn't fit in the FIFO
return true;
return running;
}
bool AudioGeneratorMOD::begin(AudioFileSource *source, AudioOutput *out)