[X7D] Audio volume initialization was not correctly done

This commit is contained in:
Bertrand Songis
2016-10-20 17:54:06 +02:00
parent 44133b595d
commit ed07dd76ef
3 changed files with 6 additions and 6 deletions
-4
View File
@@ -23,10 +23,6 @@
extern OS_MutexID audioMutex;
#if defined(SOFTWARE_VOLUME)
extern uint8_t currentSpeakerVolume;
#endif
const int16_t sineValues[] =
{
0, 196, 392, 588, 784, 980, 1175, 1370, 1564, 1758,
+1
View File
@@ -452,6 +452,7 @@ class AudioQueue {
AudioFragmentFifo fragmentsFifo;
};
extern uint8_t currentSpeakerVolume;
extern AudioQueue audioQueue;
enum {
+5 -2
View File
@@ -2456,8 +2456,11 @@ void opentxInit(OPENTX_INIT_ARGS)
}
#endif
#if defined(VOICE) && !defined(SOFTWARE_VOLUME)
setScaledVolume(g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF);
#if defined(VOICE)
currentSpeakerVolume = g_eeGeneral.speakerVolume + VOLUME_LEVEL_DEF;
#if !defined(SOFTWARE_VOLUME)
setScaledVolume(currentSpeakerVolume);
#endif
#endif
#if defined(CPUARM)