piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid repeat i.e. Telemetry Lost / Trainer Lost until prompts fifo is… (#5121)

Browse Source 
* Avoid repeat i.e. Telemetry Lost / Trainer Lost until prompts fifo is full ...

* Rename functions

* Belt and braces
This commit is contained in:
Bertrand Songis
2017-08-09 11:59:13 +02:00
committed by Andre Bernet
parent 7d386e7821
commit 96f1a16744
4 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/audio_arm.cpp
+12 -8
View File
@@ -825,9 +825,9 @@ void AudioQueue::pause(uint16_t len)
bool AudioQueue::isPlaying(uint8_t id)
{
return normalContext.hasId(id) ||
(isFunctionActive(FUNCTION_BACKGND_MUSIC) && backgroundContext.hasId(id)) ||
fragmentsFifo.hasId(id);
return normalContext.hasPromptId(id) ||
(isFunctionActive(FUNCTION_BACKGND_MUSIC) && backgroundContext.hasPromptId(id)) ||
fragmentsFifo.hasPromptId(id);
}
void AudioQueue::playTone(uint16_t freq, uint16_t len, uint16_t pause, uint8_t flags, int8_t freqIncr)
@@ -863,7 +863,7 @@ void AudioQueue::playTone(uint16_t freq, uint16_t len, uint16_t pause, uint8_t f
}
#if defined(SDCARD)
void AudioQueue::playFile(const char *filename, uint8_t flags, uint8_t id)
void AudioQueue::playFile(const char * filename, uint8_t flags, uint8_t id)
{
#if defined(SIMU)
TRACE("playFile(\"%s\", flags=%x, id=%d)", filename, flags, id);
@@ -876,7 +876,6 @@ void AudioQueue::playFile(const char *filename, uint8_t flags, uint8_t id)
#endif
#endif
if (!sdMounted())
return;
@@ -911,8 +910,12 @@ void AudioQueue::stopPlay(uint8_t id)
return;
#endif
// For the moment it's only needed to stop the background music
CoEnterMutexSection(audioMutex);
fragmentsFifo.removePromptById(id);
backgroundContext.stop(id);
CoLeaveMutexSection(audioMutex);
}
void AudioQueue::stopSD()
@@ -1052,7 +1055,8 @@ void audioEvent(unsigned int index)
#if defined(SDCARD)
char filename[AUDIO_FILENAME_MAXLEN + 1];
if (index < AU_SPECIAL_SOUND_FIRST && isAudioFileReferenced(index, filename)) {
audioQueue.playFile(filename);
audioQueue.stopPlay(ID_PLAY_PROMPT_BASE + index);
audioQueue.playFile(filename, 0, ID_PLAY_PROMPT_BASE + index);
return;
}
#endif
@@ -1206,7 +1210,7 @@ void pushUnit(uint8_t unit, uint8_t idx, uint8_t id)
{
if (unit < DIM(unitsFilenames)) {
char path[AUDIO_FILENAME_MAXLEN+1];
char *tmp = strAppendSystemAudioPath(path);
char * tmp = strAppendSystemAudioPath(path);
tmp = strAppendStringWithIndex(tmp, unitsFilenames[unit], idx);
strcpy(tmp, SOUNDS_EXT);
audioQueue.playFile(path, 0, id);