From c8c0b17fc7f90a6779d709c0e95a16da4bd101c4 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Mon, 13 Apr 2020 19:47:47 +0200 Subject: [PATCH] bug fix for server audio fade-in --- ChangeLog | 2 -- src/channel.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2fb12807..370eda2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,8 +11,6 @@ * 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 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) diff --git a/src/channel.cpp b/src/channel.cpp index 3a992426..11c35271 100755 --- a/src/channel.cpp +++ b/src/channel.cpp @@ -381,12 +381,12 @@ void CChannel::OnNetTranspPropsReceived ( CNetworkTransportProps NetworkTranspor // and audio frame size 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; } else { - iFadeInCntMax = FADE_IN_NUM_FRAMES; + iFadeInCntMax = FADE_IN_NUM_FRAMES / iNetwFrameSizeFact; iAudioFrameSizeSamples = SYSTEM_FRAME_SIZE_SAMPLES_SMALL; }