Re #3815: Audio refactoring (#3926)

This commit is contained in:
Damjan Adamic
2016-10-19 22:56:25 +02:00
committed by Bertrand Songis
parent a19f4c78bf
commit 44133b595d
12 changed files with 935 additions and 875 deletions
+8 -21
View File
@@ -364,7 +364,7 @@ uint8_t * currentBuffer = NULL;
uint32_t currentSize = 0;
int16_t newVolume = -1;
void audioSetCurrentBuffer(AudioBuffer * buffer)
void audioSetCurrentBuffer(const AudioBuffer * buffer)
{
currentBuffer = (uint8_t *)buffer->data;
currentSize = buffer->size * 2;
@@ -379,35 +379,22 @@ void audioConsumeCurrentBuffer()
newVolume = -1;
}
if (!currentBuffer) {
audioSetCurrentBuffer(audioQueue.buffersFifo.getNextFilledBuffer());
}
if (currentBuffer) {
uint32_t written = audioSpiWriteData(currentBuffer, currentSize);
currentBuffer += written;
currentSize -= written;
if (currentSize == 0) {
AudioBuffer * buffer = audioQueue.getNextFilledBuffer();
if (buffer) {
audioSetCurrentBuffer(buffer);
}
else {
currentBuffer = NULL;
currentSize = 0;
}
audioQueue.buffersFifo.freeNextFilledBuffer();
currentBuffer = NULL;
currentSize = 0;
}
}
}
void audioPushBuffer(AudioBuffer * buffer)
{
if (!currentBuffer) {
buffer->state = AUDIO_BUFFER_PLAYING;
audioSetCurrentBuffer(buffer);
audioConsumeCurrentBuffer();
}
else {
buffer->state = AUDIO_BUFFER_FILLED;
}
}
// adjust this value for a volume level just above the silence
// values is attenuation in dB, higher value - less volume
// max value is 126