From d69af0cafc295430c48c7b7d909cad9242327f95 Mon Sep 17 00:00:00 2001 From: bsongis Date: Tue, 26 Jun 2012 17:48:19 +0000 Subject: [PATCH] Audio wav files playing was already broken! --- src/ersky9x/audio.cpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/ersky9x/audio.cpp b/src/ersky9x/audio.cpp index c88bfd281..9fa56e909 100644 --- a/src/ersky9x/audio.cpp +++ b/src/ersky9x/audio.cpp @@ -73,7 +73,7 @@ void audioTimerHandle(void) // TODO Should be here! extern uint16_t Sine_values[]; -#define WAV_HEADER_SIZE 36 +#define WAV_HEADER_SIZE 44 void audioTask(void* pdata) { @@ -90,24 +90,16 @@ void audioTask(void* pdata) if (toneWavFile[0]) { FRESULT result = FR_OK; UINT read; - uint16_t bufsize = 2*WAV_BUFFER_SIZE; uint16_t * bufdata = wavSamplesBuffer; if (toneWavFile[1]) { result = f_open(&wavFile, toneWavFile, FA_OPEN_EXISTING | FA_READ); if (result == FR_OK) { - uint8_t wavHeader[WAV_HEADER_SIZE]; - result = f_read(&wavFile, (uint8_t *)wavHeader, WAV_HEADER_SIZE, &read); - if (result == FR_OK && read == WAV_HEADER_SIZE && !memcmp(wavHeader, "RIFF", 4)) { + result = f_read(&wavFile, (uint8_t *)wavSamplesArray, WAV_HEADER_SIZE, &read); + if (result == FR_OK && read == WAV_HEADER_SIZE && !memcmp(wavSamplesArray, "RIFF", 4)) { + CoSetFlag(audioFlag); bufdata = wavSamplesArray; - bufsize = 4*WAV_BUFFER_SIZE; - register Dacc *dacptr = DACC; - dacptr->DACC_TPR = CONVERT_PTR(wavSamplesArray); wavSamplesBuffer = wavSamplesArray + WAV_BUFFER_SIZE; - dacptr->DACC_TNPR = CONVERT_PTR(wavSamplesBuffer); - dacptr->DACC_TCR = WAV_BUFFER_SIZE/2; - dacptr->DACC_TNCR = WAV_BUFFER_SIZE/2; - setFrequency((wavHeader[24] << 8) + wavHeader[25]); - toneStart(); + setFrequency(wavSamplesArray[12]); } else { result = FR_DENIED; @@ -115,7 +107,7 @@ void audioTask(void* pdata) } } - if (result != FR_OK || f_read(&wavFile, (uint8_t *)bufdata, bufsize, &read) != FR_OK || read != bufsize) { + if (result != FR_OK || f_read(&wavFile, (uint8_t *)bufdata, 2*WAV_BUFFER_SIZE, &read) != FR_OK || read == 0) { toneWavFile[0] = '\0'; f_close(&wavFile); toneStop(); @@ -126,6 +118,15 @@ void audioTask(void* pdata) for (uint32_t i=0; i> 4; } + if (toneWavFile[1]) { + toneWavFile[1] = '\0'; + register Dacc *dacptr = DACC; + dacptr->DACC_TPR = CONVERT_PTR(wavSamplesArray); + dacptr->DACC_TNPR = CONVERT_PTR(wavSamplesBuffer); + dacptr->DACC_TCR = WAV_BUFFER_SIZE/2; + dacptr->DACC_TNCR = WAV_BUFFER_SIZE/2; + toneStart(); + } } #endif }