From ac0eb73bc64329dc2e3a558821d40e40b9402bc0 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sun, 2 Aug 2020 11:23:21 +0200 Subject: [PATCH] some small re-ordering of code in the server --- src/server.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index b2bc22c7..a78b820e 100755 --- a/src/server.cpp +++ b/src/server.cpp @@ -1003,16 +1003,6 @@ static CTimingMeas JitterMeas ( 1000, "test2.dat" ); JitterMeas.Measure(); // TE // get number of audio channels of current channel const int iCurNumAudChan = vecNumAudioChannels[i]; - // export the audio data for recording purpose - if ( JamController.GetRecordingEnabled() ) - { - emit AudioFrame ( iCurChanID, - vecChannels[iCurChanID].GetName(), - vecChannels[iCurChanID].GetAddress(), - iCurNumAudChan, - vecvecsData[i] ); - } - // generate a separate mix for each channel // actual processing of audio data -> mix ProcessData ( vecvecsData, @@ -1096,17 +1086,27 @@ opus_custom_encoder_ctl ( CurOpusEncoder, vecvecbyCodedData[i], iCeltNumCodedBytes ); } + } - // update socket buffer size - vecChannels[iCurChanID].UpdateSocketBufferSize(); + // update socket buffer size + vecChannels[iCurChanID].UpdateSocketBufferSize(); - // send channel levels - if ( bSendChannelLevels && vecChannels[iCurChanID].ChannelLevelsRequired() ) - { - ConnLessProtocol.CreateCLChannelLevelListMes ( vecChannels[iCurChanID].GetAddress(), - vecChannelLevels, - iNumClients ); - } + // send channel levels + if ( bSendChannelLevels && vecChannels[iCurChanID].ChannelLevelsRequired() ) + { + ConnLessProtocol.CreateCLChannelLevelListMes ( vecChannels[iCurChanID].GetAddress(), + vecChannelLevels, + iNumClients ); + } + + // export the audio data for recording purpose + if ( JamController.GetRecordingEnabled() ) + { + emit AudioFrame ( iCurChanID, + vecChannels[iCurChanID].GetName(), + vecChannels[iCurChanID].GetAddress(), + iCurNumAudChan, + vecvecsData[i] ); } } }