Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Fixes #1658

Browse source
This commit is contained in:
bsongis 2014-08-29 23:05:24 +02:00
parent 419f133fb1
commit 69b5f2fddf
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
radio/src/audio_arm.cpp
View file

@ -607,7 +607,6 @@ int WavContext::mixBuffer(AudioBuffer *buffer, int volume, unsigned int fade)
} }
} }
clear();
return -result; return -result;
} }
#else #else
@ -719,12 +718,18 @@ void AudioQueue::wakeup()
} }
// mix the normal context (tones and wavs) // mix the normal context (tones and wavs)
if (normalContext.fragment.type == FRAGMENT_TONE) if (normalContext.fragment.type == FRAGMENT_TONE) {
result = normalContext.tone.mixBuffer(buffer, g_eeGeneral.beepVolume, fade); result = normalContext.tone.mixBuffer(buffer, g_eeGeneral.beepVolume, fade);
else if (normalContext.fragment.type == FRAGMENT_FILE) }
else if (normalContext.fragment.type == FRAGMENT_FILE) {
result = normalContext.wav.mixBuffer(buffer, g_eeGeneral.wavVolume, fade); result = normalContext.wav.mixBuffer(buffer, g_eeGeneral.wavVolume, fade);
else if (result < 0) {
normalContext.wav.clear();
}
}
else {
result = 0; result = 0;
}
if (result > 0) { if (result > 0) {
size = max(size, result); size = max(size, result);
fade += 1; fade += 1;