merge fixes

This commit is contained in:
Volker Fischer 2020-06-21 07:16:37 +02:00
parent f8768020d6
commit 5d6fab183e
2 changed files with 2 additions and 1 deletions

View file

@ -19,6 +19,7 @@
- the local pan middle position is no longer attenuated in Mono-in/Stereo-out mode (#353) - the local pan middle position is no longer attenuated in Mono-in/Stereo-out mode (#353)
- added some protections to the code, coded by atsampson (#380, #381, #382)

View file

@ -29,7 +29,7 @@
CChannel::CChannel ( const bool bNIsServer ) : CChannel::CChannel ( const bool bNIsServer ) :
vecdGains ( MAX_NUM_CHANNELS, 1.0 ), vecdGains ( MAX_NUM_CHANNELS, 1.0 ),
vecdPannings ( MAX_NUM_CHANNELS, 0.5 ), vecdPannings ( MAX_NUM_CHANNELS, 0.5 ),
iCurSockBufNumFrames ( -1 ), iCurSockBufNumFrames ( INVALID_INDEX ),
bDoAutoSockBufSize ( true ), bDoAutoSockBufSize ( true ),
iFadeInCnt ( 0 ), iFadeInCnt ( 0 ),
iFadeInCntMax ( FADE_IN_NUM_FRAMES_DBLE_FRAMESIZE ), iFadeInCntMax ( FADE_IN_NUM_FRAMES_DBLE_FRAMESIZE ),