Merge branch 'bsongis/Taranis_audio_freeze' of https://github.com/opentx/opentx into next

This commit is contained in:
Andre Bernet
2014-01-05 12:26:14 +01:00
9 changed files with 28 additions and 4 deletions
+7 -2
View File
@@ -337,10 +337,15 @@ void AudioQueue::pushBuffer(AudioBuffer *buffer)
{
buffer->state = AUDIO_BUFFER_FILLED;
if (dacQueue(buffer))
buffer->state = AUDIO_BUFFER_PLAYING;
__disable_irq();
bufferWIdx = nextBufferIdx(bufferWIdx);
if (dacQueue(buffer)) {
buffer->state = AUDIO_BUFFER_PLAYING;
}
__enable_irq();
}
void mix(uint16_t * result, int sample, unsigned int fade)