bug fix for server audio fade-in

This commit is contained in:
Volker Fischer 2020-04-13 19:47:47 +02:00
parent c5d9b29aaa
commit c8c0b17fc7
2 changed files with 2 additions and 4 deletions

View file

@ -11,8 +11,6 @@
* bug fix: the server welcome message may appear twice if the server list was double clicked * bug fix: the server welcome message may appear twice if the server list was double clicked
TODO check for audio fade in time at the server with newest version -> is it still correct?
TODO mixer faders linear -> log gain is better: CalcFaderGain() -> x = -50:1:0; plot(x, (10 .^ (x / 10))) TODO mixer faders linear -> log gain is better: CalcFaderGain() -> x = -50:1:0; plot(x, (10 .^ (x / 10)))
TODO offer the Jamulus ASIO settingspanel in case of an ASIO ERROR to fix, e.g., incorrect sample rate (https://sourceforge.net/p/llcon/discussion/533517/thread/777663cf94/#035f) TODO offer the Jamulus ASIO settingspanel in case of an ASIO ERROR to fix, e.g., incorrect sample rate (https://sourceforge.net/p/llcon/discussion/533517/thread/777663cf94/#035f)

View file

@ -381,12 +381,12 @@ void CChannel::OnNetTranspPropsReceived ( CNetworkTransportProps NetworkTranspor
// and audio frame size // and audio frame size
if ( eAudioCompressionType == CT_OPUS ) if ( eAudioCompressionType == CT_OPUS )
{ {
iFadeInCntMax = FADE_IN_NUM_FRAMES_DBLE_FRAMESIZE; iFadeInCntMax = FADE_IN_NUM_FRAMES_DBLE_FRAMESIZE / iNetwFrameSizeFact;
iAudioFrameSizeSamples = DOUBLE_SYSTEM_FRAME_SIZE_SAMPLES; iAudioFrameSizeSamples = DOUBLE_SYSTEM_FRAME_SIZE_SAMPLES;
} }
else else
{ {
iFadeInCntMax = FADE_IN_NUM_FRAMES; iFadeInCntMax = FADE_IN_NUM_FRAMES / iNetwFrameSizeFact;
iAudioFrameSizeSamples = SYSTEM_FRAME_SIZE_SAMPLES_SMALL; iAudioFrameSizeSamples = SYSTEM_FRAME_SIZE_SAMPLES_SMALL;
} }