From 9f7fc16ac389ca91c198110fff0f5a6a646eb46c Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sun, 26 Apr 2020 16:20:21 +0200 Subject: [PATCH] fixed compiler warnings --- src/audiomixerboard.cpp | 8 +------- src/client.cpp | 32 ++++++++++++++++---------------- src/server.cpp | 22 +++++++++++----------- 3 files changed, 28 insertions(+), 34 deletions(-) diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index c1ca9713..4bc949f6 100755 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -713,13 +713,7 @@ void CAudioMixerBoard::SetServerName ( const QString& strNewServerName ) // list was received, the connection was successful and the title is updated // with the correct server name. Make sure to choose a "try to connect" title // which is most striking (we use filled blocks and upper case letters). - QByteArray baBlock; - baBlock.append ( 0xE2 ); - baBlock.append ( 0x96 ); - baBlock.append ( 0x88 ); - QString sBlocks = QString().fromUtf8 ( baBlock ).repeated ( 5 ); - - pGroupBox->setTitle ( sBlocks + " T R Y I N G T O C O N N E C T " + sBlocks ); + pGroupBox->setTitle ( u8"\u2588\u2588\u2588\u2588\u2588 T R Y I N G T O C O N N E C T \u2588\u2588\u2588\u2588\u2588" ); } } diff --git a/src/client.cpp b/src/client.cpp index 515bc012..fd98749a 100755 --- a/src/client.cpp +++ b/src/client.cpp @@ -945,7 +945,7 @@ vecsMultChanAudioSndCrd = vecsStereoSndCrdTMP; // TEST just copy the stereo data void CClient::ProcessAudioDataIntern ( CVector& vecsStereoSndCrd ) { - int i, j; + int i, j, iUnused; unsigned char* pCurCodedData; @@ -1094,19 +1094,19 @@ void CClient::ProcessAudioDataIntern ( CVector& vecsStereoSndCrd ) { if ( bMuteOutStream ) { - opus_custom_encode ( CurOpusEncoder, - &vecZeros[i * iNumAudioChannels * iOPUSFrameSizeSamples], - iOPUSFrameSizeSamples, - &vecCeltData[0], - iCeltNumCodedBytes ); + iUnused = opus_custom_encode ( CurOpusEncoder, + &vecZeros[i * iNumAudioChannels * iOPUSFrameSizeSamples], + iOPUSFrameSizeSamples, + &vecCeltData[0], + iCeltNumCodedBytes ); } else { - opus_custom_encode ( CurOpusEncoder, - &vecsStereoSndCrd[i * iNumAudioChannels * iOPUSFrameSizeSamples], - iOPUSFrameSizeSamples, - &vecCeltData[0], - iCeltNumCodedBytes ); + iUnused = opus_custom_encode ( CurOpusEncoder, + &vecsStereoSndCrd[i * iNumAudioChannels * iOPUSFrameSizeSamples], + iOPUSFrameSizeSamples, + &vecCeltData[0], + iCeltNumCodedBytes ); } } @@ -1150,11 +1150,11 @@ void CClient::ProcessAudioDataIntern ( CVector& vecsStereoSndCrd ) // OPUS decoding if ( CurOpusDecoder != nullptr ) { - opus_custom_decode ( CurOpusDecoder, - pCurCodedData, - iCeltNumCodedBytes, - &vecsStereoSndCrd[i * iNumAudioChannels * iOPUSFrameSizeSamples], - iOPUSFrameSizeSamples ); + iUnused = opus_custom_decode ( CurOpusDecoder, + pCurCodedData, + iCeltNumCodedBytes, + &vecsStereoSndCrd[i * iNumAudioChannels * iOPUSFrameSizeSamples], + iOPUSFrameSizeSamples ); } } diff --git a/src/server.cpp b/src/server.cpp index d3658c0c..36a3e3e0 100755 --- a/src/server.cpp +++ b/src/server.cpp @@ -942,7 +942,7 @@ void CServer::Stop() void CServer::OnTimer() { - int i, j; + int i, j, iUnused; int iClientFrameSizeSamples; OpusCustomDecoder* CurOpusDecoder; OpusCustomEncoder* CurOpusEncoder; @@ -1095,11 +1095,11 @@ JitterMeas.Measure(); // OPUS decode received data stream if ( CurOpusDecoder != nullptr ) { - opus_custom_decode ( CurOpusDecoder, - pCurCodedData, - iCeltNumCodedBytes, - &vecvecsData[i][iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i]], - iClientFrameSizeSamples ); + iUnused = opus_custom_decode ( CurOpusDecoder, + pCurCodedData, + iCeltNumCodedBytes, + &vecvecsData[i][iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i]], + iClientFrameSizeSamples ); } } @@ -1242,11 +1242,11 @@ JitterMeas.Measure(); opus_custom_encoder_ctl ( CurOpusEncoder, OPUS_SET_BITRATE ( CalcBitRateBitsPerSecFromCodedBytes ( iCeltNumCodedBytes, iClientFrameSizeSamples ) ) ); - opus_custom_encode ( CurOpusEncoder, - &vecsSendData[iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i]], - iClientFrameSizeSamples, - &vecbyCodedData[0], - iCeltNumCodedBytes ); + iUnused = opus_custom_encode ( CurOpusEncoder, + &vecsSendData[iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i]], + iClientFrameSizeSamples, + &vecbyCodedData[0], + iCeltNumCodedBytes ); } // send separate mix to current clients