eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed compiler warnings

Browse source
This commit is contained in:
Volker Fischer 2020-04-26 16:20:21 +02:00
parent 30c2bddd03
commit 9f7fc16ac3
3 changed files with 28 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/audiomixerboard.cpp
View file

@ -713,13 +713,7 @@ void CAudioMixerBoard::SetServerName ( const QString& strNewServerName )
// list was received, the connection was successful and the title is updated // 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 // 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). // which is most striking (we use filled blocks and upper case letters).
QByteArray baBlock; 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" );
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 );
} }
} }

32
src/client.cpp
View file

@ -945,7 +945,7 @@ vecsMultChanAudioSndCrd = vecsStereoSndCrdTMP; // TEST just copy the stereo data
void CClient::ProcessAudioDataIntern ( CVector<int16_t>& vecsStereoSndCrd ) void CClient::ProcessAudioDataIntern ( CVector<int16_t>& vecsStereoSndCrd )
{ {
int i, j; int i, j, iUnused;
unsigned char* pCurCodedData; unsigned char* pCurCodedData;
@ -1094,19 +1094,19 @@ void CClient::ProcessAudioDataIntern ( CVector<int16_t>& vecsStereoSndCrd )
{ {
if ( bMuteOutStream ) if ( bMuteOutStream )
{ {
opus_custom_encode ( CurOpusEncoder, iUnused = opus_custom_encode ( CurOpusEncoder,
&vecZeros[i * iNumAudioChannels * iOPUSFrameSizeSamples], &vecZeros[i * iNumAudioChannels * iOPUSFrameSizeSamples],
iOPUSFrameSizeSamples, iOPUSFrameSizeSamples,
&vecCeltData[0], &vecCeltData[0],
iCeltNumCodedBytes ); iCeltNumCodedBytes );
} }
else else
{ {
opus_custom_encode ( CurOpusEncoder, iUnused = opus_custom_encode ( CurOpusEncoder,
&vecsStereoSndCrd[i * iNumAudioChannels * iOPUSFrameSizeSamples], &vecsStereoSndCrd[i * iNumAudioChannels * iOPUSFrameSizeSamples],
iOPUSFrameSizeSamples, iOPUSFrameSizeSamples,
&vecCeltData[0], &vecCeltData[0],
iCeltNumCodedBytes ); iCeltNumCodedBytes );
} }
} }
@ -1150,11 +1150,11 @@ void CClient::ProcessAudioDataIntern ( CVector<int16_t>& vecsStereoSndCrd )
// OPUS decoding // OPUS decoding
if ( CurOpusDecoder != nullptr ) if ( CurOpusDecoder != nullptr )
{ {
opus_custom_decode ( CurOpusDecoder, iUnused = opus_custom_decode ( CurOpusDecoder,
pCurCodedData, pCurCodedData,
iCeltNumCodedBytes, iCeltNumCodedBytes,
&vecsStereoSndCrd[i * iNumAudioChannels * iOPUSFrameSizeSamples], &vecsStereoSndCrd[i * iNumAudioChannels * iOPUSFrameSizeSamples],
iOPUSFrameSizeSamples ); iOPUSFrameSizeSamples );
} }
} }

22
src/server.cpp
View file

@ -942,7 +942,7 @@ void CServer::Stop()
void CServer::OnTimer() void CServer::OnTimer()
{ {
int i, j; int i, j, iUnused;
int iClientFrameSizeSamples; int iClientFrameSizeSamples;
OpusCustomDecoder* CurOpusDecoder; OpusCustomDecoder* CurOpusDecoder;
OpusCustomEncoder* CurOpusEncoder; OpusCustomEncoder* CurOpusEncoder;
@ -1095,11 +1095,11 @@ JitterMeas.Measure();
// OPUS decode received data stream // OPUS decode received data stream
if ( CurOpusDecoder != nullptr ) if ( CurOpusDecoder != nullptr )
{ {
opus_custom_decode ( CurOpusDecoder, iUnused = opus_custom_decode ( CurOpusDecoder,
pCurCodedData, pCurCodedData,
iCeltNumCodedBytes, iCeltNumCodedBytes,
&vecvecsData[i][iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i]], &vecvecsData[i][iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i]],
iClientFrameSizeSamples ); iClientFrameSizeSamples );
} }
} }
@ -1242,11 +1242,11 @@ JitterMeas.Measure();
opus_custom_encoder_ctl ( CurOpusEncoder, opus_custom_encoder_ctl ( CurOpusEncoder,
OPUS_SET_BITRATE ( CalcBitRateBitsPerSecFromCodedBytes ( iCeltNumCodedBytes, iClientFrameSizeSamples ) ) ); OPUS_SET_BITRATE ( CalcBitRateBitsPerSecFromCodedBytes ( iCeltNumCodedBytes, iClientFrameSizeSamples ) ) );
opus_custom_encode ( CurOpusEncoder, iUnused = opus_custom_encode ( CurOpusEncoder,
&vecsSendData[iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i]], &vecsSendData[iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[i]],
iClientFrameSizeSamples, iClientFrameSizeSamples,
&vecbyCodedData[0], &vecbyCodedData[0],
iCeltNumCodedBytes ); iCeltNumCodedBytes );
} }
// send separate mix to current clients // send separate mix to current clients