Skip to content

Commit

Permalink
Add some missing const refs to CHostAddress params
Browse files Browse the repository at this point in the history
  • Loading branch information
softins committed Apr 2, 2024
1 parent e12cb71 commit d6b9e43
Show file tree
Hide file tree
Showing 22 changed files with 105 additions and 105 deletions.
2 changes: 1 addition & 1 deletion src/channel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ void CChannel::PutProtocolData ( const int iRecCounter, const int iRecID, const
}
}

EPutDataStat CChannel::PutAudioData ( const CVector<uint8_t>& vecbyData, const int iNumBytes, CHostAddress RecHostAddr )
EPutDataStat CChannel::PutAudioData ( const CVector<uint8_t>& vecbyData, const int iNumBytes, const CHostAddress& RecHostAddr )
{
// init return state
EPutDataStat eRet = PS_GEN_ERROR;
Expand Down
10 changes: 5 additions & 5 deletions src/channel.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class CChannel : public QObject

void PutProtocolData ( const int iRecCounter, const int iRecID, const CVector<uint8_t>& vecbyMesBodyData, const CHostAddress& RecHostAddr );

EPutDataStat PutAudioData ( const CVector<uint8_t>& vecbyData, const int iNumBytes, CHostAddress RecHostAddr );
EPutDataStat PutAudioData ( const CVector<uint8_t>& vecbyData, const int iNumBytes, const CHostAddress& RecHostAddr );

EGetDataStat GetData ( CVector<uint8_t>& vecbyData, const int iNumBytes );

Expand All @@ -83,7 +83,7 @@ class CChannel : public QObject
void SetEnable ( const bool bNEnStat );
bool IsEnabled() { return bIsEnabled; }

void SetAddress ( const CHostAddress NAddr ) { InetAddr = NAddr; }
void SetAddress ( const CHostAddress& NAddr ) { InetAddr = NAddr; }
const CHostAddress& GetAddress() const { return InetAddr; }

void ResetInfo()
Expand Down Expand Up @@ -250,12 +250,12 @@ public slots:
Protocol.ParseMessageBody ( vecbyMesBodyData, iRecCounter, iRecID );
}

void OnProtocolMessageReceived ( int iRecCounter, int iRecID, CVector<uint8_t> vecbyMesBodyData, CHostAddress RecHostAddr )
void OnProtocolMessageReceived ( int iRecCounter, int iRecID, CVector<uint8_t> vecbyMesBodyData, const CHostAddress& RecHostAddr )
{
PutProtocolData ( iRecCounter, iRecID, vecbyMesBodyData, RecHostAddr );
}

void OnProtocolCLMessageReceived ( int iRecID, CVector<uint8_t> vecbyMesBodyData, CHostAddress RecHostAddr )
void OnProtocolCLMessageReceived ( int iRecID, CVector<uint8_t> vecbyMesBodyData, const CHostAddress& RecHostAddr )
{
emit DetectedCLMessage ( vecbyMesBodyData, iRecID, RecHostAddr );
}
Expand All @@ -282,7 +282,7 @@ public slots:
void RecorderStateReceived ( ERecorderState eRecorderState );
void Disconnected();

void DetectedCLMessage ( CVector<uint8_t> vecbyMesBodyData, int iRecID, CHostAddress RecHostAddr );
void DetectedCLMessage ( CVector<uint8_t> vecbyMesBodyData, int iRecID, const CHostAddress& RecHostAddr );

void ParseMessageBody ( CVector<uint8_t> vecbyMesBodyData, int iRecCounter, int iRecID );
};
10 changes: 5 additions & 5 deletions src/client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -223,14 +223,14 @@ void CClient::OnSendProtMessage ( CVector<uint8_t> vecMessage )
Socket.SendPacket ( vecMessage, Channel.GetAddress() );
}

void CClient::OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecMessage )
void CClient::OnSendCLProtMessage ( const CHostAddress& InetAddr, CVector<uint8_t> vecMessage )
{
// the protocol queries me to call the function to send the message
// send it through the network
Socket.SendPacket ( vecMessage, InetAddr );
}

void CClient::OnInvalidPacketReceived ( CHostAddress RecHostAddr )
void CClient::OnInvalidPacketReceived ( const CHostAddress& RecHostAddr )
{
// message could not be parsed, check if the packet comes
// from the server we just connected -> if yes, send
Expand All @@ -242,7 +242,7 @@ void CClient::OnInvalidPacketReceived ( CHostAddress RecHostAddr )
}
}

void CClient::OnDetectedCLMessage ( CVector<uint8_t> vecbyMesBodyData, int iRecID, CHostAddress RecHostAddr )
void CClient::OnDetectedCLMessage ( CVector<uint8_t> vecbyMesBodyData, int iRecID, const CHostAddress& RecHostAddr )
{
// connection less messages are always processed
ConnLessProtocol.ParseConnectionLessMessageBody ( vecbyMesBodyData, iRecID, RecHostAddr );
Expand Down Expand Up @@ -334,7 +334,7 @@ void CClient::CreateServerJitterBufferMessage()
}
}

void CClient::OnCLPingReceived ( CHostAddress InetAddr, int iMs )
void CClient::OnCLPingReceived ( const CHostAddress& InetAddr, int iMs )
{
// make sure we are running and the server address is correct
if ( IsRunning() && ( InetAddr == Channel.GetAddress() ) )
Expand All @@ -350,7 +350,7 @@ void CClient::OnCLPingReceived ( CHostAddress InetAddr, int iMs )
}
}

void CClient::OnCLPingWithNumClientsReceived ( CHostAddress InetAddr, int iMs, int iNumClients )
void CClient::OnCLPingWithNumClientsReceived ( const CHostAddress& InetAddr, int iMs, int iNumClients )
{
// take care of wrap arounds (if wrapping, do not use result)
const int iCurDiff = EvaluatePingMessage ( iMs );
Expand Down
24 changes: 12 additions & 12 deletions src/client.h
Original file line number Diff line number Diff line change
Expand Up @@ -375,26 +375,26 @@ class CClient : public QObject
protected slots:
void OnHandledSignal ( int sigNum );
void OnSendProtMessage ( CVector<uint8_t> vecMessage );
void OnInvalidPacketReceived ( CHostAddress RecHostAddr );
void OnInvalidPacketReceived ( const CHostAddress& RecHostAddr );

void OnDetectedCLMessage ( CVector<uint8_t> vecbyMesBodyData, int iRecID, CHostAddress RecHostAddr );
void OnDetectedCLMessage ( CVector<uint8_t> vecbyMesBodyData, int iRecID, const CHostAddress& RecHostAddr );

void OnReqJittBufSize() { CreateServerJitterBufferMessage(); }
void OnJittBufSizeChanged ( int iNewJitBufSize );
void OnReqChanInfo() { Channel.SetRemoteInfo ( ChannelInfo ); }
void OnNewConnection();
void OnCLDisconnection ( CHostAddress InetAddr )
void OnCLDisconnection ( const CHostAddress& InetAddr )
{
if ( InetAddr == Channel.GetAddress() )
{
emit Disconnected();
}
}
void OnCLPingReceived ( CHostAddress InetAddr, int iMs );
void OnCLPingReceived ( const CHostAddress& InetAddr, int iMs );

void OnSendCLProtMessage ( CHostAddress InetAddr, CVector<uint8_t> vecMessage );
void OnSendCLProtMessage ( const CHostAddress& InetAddr, CVector<uint8_t> vecMessage );

void OnCLPingWithNumClientsReceived ( CHostAddress InetAddr, int iMs, int iNumClients );
void OnCLPingWithNumClientsReceived ( const CHostAddress& InetAddr, int iMs, int iNumClients );

void OnSndCrdReinitRequest ( int iSndCrdResetType );
void OnControllerInFaderLevel ( int iChannelIdx, int iValue );
Expand All @@ -415,17 +415,17 @@ protected slots:
void PingTimeReceived ( int iPingTime );
void RecorderStateReceived ( ERecorderState eRecorderState );

void CLServerListReceived ( CHostAddress InetAddr, CVector<CServerInfo> vecServerInfo );
void CLServerListReceived ( const CHostAddress& InetAddr, CVector<CServerInfo> vecServerInfo );

void CLRedServerListReceived ( CHostAddress InetAddr, CVector<CServerInfo> vecServerInfo );
void CLRedServerListReceived ( const CHostAddress& InetAddr, CVector<CServerInfo> vecServerInfo );

void CLConnClientsListMesReceived ( CHostAddress InetAddr, CVector<CChannelInfo> vecChanInfo );
void CLConnClientsListMesReceived ( const CHostAddress& InetAddr, CVector<CChannelInfo> vecChanInfo );

void CLPingTimeWithNumClientsReceived ( CHostAddress InetAddr, int iPingTime, int iNumClients );
void CLPingTimeWithNumClientsReceived ( const CHostAddress& InetAddr, int iPingTime, int iNumClients );

void CLVersionAndOSReceived ( CHostAddress InetAddr, COSUtil::EOpSystemType eOSType, QString strVersion );
void CLVersionAndOSReceived ( const CHostAddress& InetAddr, COSUtil::EOpSystemType eOSType, QString strVersion );

void CLChannelLevelListReceived ( CHostAddress InetAddr, CVector<uint16_t> vecLevelList );
void CLChannelLevelListReceived ( const CHostAddress& InetAddr, CVector<uint16_t> vecLevelList );

void Disconnected();
void SoundDeviceChanged ( QString strError );
Expand Down
4 changes: 2 additions & 2 deletions src/clientdlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ void CClientDlg::OnVersionAndOSReceived ( COSUtil::EOpSystemType, QString strVer
#endif
}

void CClientDlg::OnCLVersionAndOSReceived ( CHostAddress, COSUtil::EOpSystemType, QString strVersion )
void CClientDlg::OnCLVersionAndOSReceived ( const CHostAddress&, COSUtil::EOpSystemType, QString strVersion )
{
// update check
#if ( QT_VERSION >= QT_VERSION_CHECK( 5, 6, 0 ) ) && !defined( DISABLE_VERSION_CHECK )
Expand Down Expand Up @@ -1187,7 +1187,7 @@ void CClientDlg::OnSoundDeviceChanged ( QString strError )
ClientSettingsDlg.UpdateSoundDeviceChannelSelectionFrame();
}

void CClientDlg::OnCLPingTimeWithNumClientsReceived ( CHostAddress InetAddr, int iPingTime, int iNumClients )
void CClientDlg::OnCLPingTimeWithNumClientsReceived ( const CHostAddress& InetAddr, int iPingTime, int iNumClients )
{
// update connection dialog server list
ConnectDlg.SetPingTimeAndNumClientsResult ( InetAddr, iPingTime, iNumClients );
Expand Down
20 changes: 10 additions & 10 deletions src/clientdlg.h
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public slots:

void OnTimerPing();
void OnPingTimeResult ( int iPingTime );
void OnCLPingTimeWithNumClientsReceived ( CHostAddress InetAddr, int iPingTime, int iNumClients );
void OnCLPingTimeWithNumClientsReceived ( const CHostAddress& InetAddr, int iPingTime, int iNumClients );

void OnControllerInFaderLevel ( const int iChannelIdx, const int iValue ) { MainMixerBoard->SetFaderLevel ( iChannelIdx, iValue ); }

Expand All @@ -151,7 +151,7 @@ public slots:

void OnVersionAndOSReceived ( COSUtil::EOpSystemType, QString strVersion );

void OnCLVersionAndOSReceived ( CHostAddress, COSUtil::EOpSystemType, QString strVersion );
void OnCLVersionAndOSReceived ( const CHostAddress&, COSUtil::EOpSystemType, QString strVersion );

void OnLoadChannelSetup();
void OnSaveChannelSetup();
Expand Down Expand Up @@ -199,25 +199,25 @@ public slots:

void OnNewLocalInputText ( QString strChatText ) { pClient->CreateChatTextMes ( strChatText ); }

void OnReqServerListQuery ( CHostAddress InetAddr ) { pClient->CreateCLReqServerListMes ( InetAddr ); }
void OnReqServerListQuery ( const CHostAddress& InetAddr ) { pClient->CreateCLReqServerListMes ( InetAddr ); }

void OnCreateCLServerListPingMes ( CHostAddress InetAddr ) { pClient->CreateCLServerListPingMes ( InetAddr ); }
void OnCreateCLServerListPingMes ( const CHostAddress& InetAddr ) { pClient->CreateCLServerListPingMes ( InetAddr ); }

void OnCreateCLServerListReqVerAndOSMes ( CHostAddress InetAddr ) { pClient->CreateCLServerListReqVerAndOSMes ( InetAddr ); }
void OnCreateCLServerListReqVerAndOSMes ( const CHostAddress& InetAddr ) { pClient->CreateCLServerListReqVerAndOSMes ( InetAddr ); }

void OnCreateCLServerListReqConnClientsListMes ( CHostAddress InetAddr ) { pClient->CreateCLServerListReqConnClientsListMes ( InetAddr ); }
void OnCreateCLServerListReqConnClientsListMes ( const CHostAddress& InetAddr ) { pClient->CreateCLServerListReqConnClientsListMes ( InetAddr ); }

void OnCLServerListReceived ( CHostAddress InetAddr, CVector<CServerInfo> vecServerInfo )
void OnCLServerListReceived ( const CHostAddress& InetAddr, CVector<CServerInfo> vecServerInfo )
{
ConnectDlg.SetServerList ( InetAddr, vecServerInfo );
}

void OnCLRedServerListReceived ( CHostAddress InetAddr, CVector<CServerInfo> vecServerInfo )
void OnCLRedServerListReceived ( const CHostAddress& InetAddr, CVector<CServerInfo> vecServerInfo )
{
ConnectDlg.SetServerList ( InetAddr, vecServerInfo, true );
}

void OnCLConnClientsListMesReceived ( CHostAddress InetAddr, CVector<CChannelInfo> vecChanInfo )
void OnCLConnClientsListMesReceived ( const CHostAddress& InetAddr, CVector<CChannelInfo> vecChanInfo )
{
ConnectDlg.SetConnClientsList ( InetAddr, vecChanInfo );
}
Expand All @@ -226,7 +226,7 @@ public slots:

void OnMuteStateHasChangedReceived ( int iChanID, bool bIsMuted ) { MainMixerBoard->SetRemoteFaderIsMute ( iChanID, bIsMuted ); }

void OnCLChannelLevelListReceived ( CHostAddress /* unused */, CVector<uint16_t> vecLevelList )
void OnCLChannelLevelListReceived ( const CHostAddress& /* unused */, CVector<uint16_t> vecLevelList )
{
MainMixerBoard->SetChannelLevels ( vecLevelList );
}
Expand Down
2 changes: 1 addition & 1 deletion src/clientrpc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ CClientRpc::CClientRpc ( CClient* pClient, CRpcServer* pRpcServer, QObject* pare
/// @param {array} params.channelLevelList - The channel level list.
/// Each item corresponds to the respective client retrieved from the jamulusclient/clientListReceived notification.
/// @param {number} params.channelLevelList[*] - The channel level, an integer between 0 and 9.
connect ( pClient, &CClient::CLChannelLevelListReceived, [=] ( CHostAddress /* unused */, CVector<uint16_t> vecLevelList ) {
connect ( pClient, &CClient::CLChannelLevelListReceived, [=] ( const CHostAddress& /* unused */, CVector<uint16_t> vecLevelList ) {
QJsonArray arrLevelList;
for ( const auto& level : vecLevelList )
{
Expand Down
8 changes: 4 additions & 4 deletions src/connectdlg.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ public slots:
void OnTimerReRequestServList();

signals:
void ReqServerListQuery ( CHostAddress InetAddr );
void CreateCLServerListPingMes ( CHostAddress InetAddr );
void CreateCLServerListReqVerAndOSMes ( CHostAddress InetAddr );
void CreateCLServerListReqConnClientsListMes ( CHostAddress InetAddr );
void ReqServerListQuery ( const CHostAddress& InetAddr );
void CreateCLServerListPingMes ( const CHostAddress& InetAddr );
void CreateCLServerListReqVerAndOSMes ( const CHostAddress& InetAddr );
void CreateCLServerListReqConnClientsListMes ( const CHostAddress& InetAddr );
};
36 changes: 18 additions & 18 deletions src/protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ public slots:
signals:
// transmitting
void MessReadyForSending ( CVector<uint8_t> vecMessage );
void CLMessReadyForSending ( CHostAddress InetAddr, CVector<uint8_t> vecMessage );
void CLMessReadyForSending ( const CHostAddress& InetAddr, CVector<uint8_t> vecMessage );

// receiving
void ChangeJittBufSize ( int iNewJitBufSize );
Expand All @@ -325,24 +325,24 @@ public slots:
void VersionAndOSReceived ( COSUtil::EOpSystemType eOSType, QString strVersion );
void RecorderStateReceived ( ERecorderState eRecorderState );

void CLPingReceived ( CHostAddress InetAddr, int iMs );
void CLPingWithNumClientsReceived ( CHostAddress InetAddr, int iMs, int iNumClients );
void CLRegisterServerReceived ( CHostAddress InetAddr, CHostAddress LInetAddr, CServerCoreInfo ServerInfo );
void CLRegisterServerExReceived ( CHostAddress InetAddr,
CHostAddress LInetAddr,
void CLPingReceived ( const CHostAddress& InetAddr, int iMs );
void CLPingWithNumClientsReceived ( const CHostAddress& InetAddr, int iMs, int iNumClients );
void CLRegisterServerReceived ( const CHostAddress& InetAddr, const CHostAddress& LInetAddr, CServerCoreInfo ServerInfo );
void CLRegisterServerExReceived ( const CHostAddress& InetAddr,
const CHostAddress& LInetAddr,
CServerCoreInfo ServerInfo,
COSUtil::EOpSystemType eOSType,
QString strVersion );
void CLUnregisterServerReceived ( CHostAddress InetAddr );
void CLServerListReceived ( CHostAddress InetAddr, CVector<CServerInfo> vecServerInfo );
void CLRedServerListReceived ( CHostAddress InetAddr, CVector<CServerInfo> vecServerInfo );
void CLReqServerList ( CHostAddress InetAddr );
void CLSendEmptyMes ( CHostAddress TargetInetAddr );
void CLDisconnection ( CHostAddress InetAddr );
void CLVersionAndOSReceived ( CHostAddress InetAddr, COSUtil::EOpSystemType eOSType, QString strVersion );
void CLReqVersionAndOS ( CHostAddress InetAddr );
void CLConnClientsListMesReceived ( CHostAddress InetAddr, CVector<CChannelInfo> vecChanInfo );
void CLReqConnClientsList ( CHostAddress InetAddr );
void CLChannelLevelListReceived ( CHostAddress InetAddr, CVector<uint16_t> vecLevelList );
void CLRegisterServerResp ( CHostAddress InetAddr, ESvrRegResult eStatus );
void CLUnregisterServerReceived ( const CHostAddress& InetAddr );
void CLServerListReceived ( const CHostAddress& InetAddr, CVector<CServerInfo> vecServerInfo );
void CLRedServerListReceived ( const CHostAddress& InetAddr, CVector<CServerInfo> vecServerInfo );
void CLReqServerList ( const CHostAddress& InetAddr );
void CLSendEmptyMes ( const CHostAddress& TargetInetAddr );
void CLDisconnection ( const CHostAddress& InetAddr );
void CLVersionAndOSReceived ( const CHostAddress& InetAddr, COSUtil::EOpSystemType eOSType, QString strVersion );
void CLReqVersionAndOS ( const CHostAddress& InetAddr );
void CLConnClientsListMesReceived ( const CHostAddress& InetAddr, CVector<CChannelInfo> vecChanInfo );
void CLReqConnClientsList ( const CHostAddress& InetAddr );
void CLChannelLevelListReceived ( const CHostAddress& InetAddr, CVector<uint16_t> vecLevelList );
void CLRegisterServerResp ( const CHostAddress& InetAddr, ESvrRegResult eStatus );
};
2 changes: 1 addition & 1 deletion src/recorder/jamcontroller.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class CJamController : public QObject
void ClientDisconnected ( int iChID );
void AudioFrame ( const int iChID,
const QString stChName,
const CHostAddress RecHostAddr,
const CHostAddress& RecHostAddr,
const int iNumAudChan,
const CVector<int16_t> vecsData );
};
Expand Down
6 changes: 3 additions & 3 deletions src/recorder/jamrecorder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ using namespace recorder;
* Creates a file for the raw PCM data and sets up a QDataStream to which to write received frames.
* The data is stored Little Endian.
*/
CJamClient::CJamClient ( const qint64 frame, const int _numChannels, const QString name, const CHostAddress address, const QDir recordBaseDir ) :
CJamClient::CJamClient ( const qint64 frame, const int _numChannels, const QString name, const CHostAddress& address, const QDir recordBaseDir ) :
startFrame ( frame ),
numChannels ( static_cast<uint16_t> ( _numChannels ) ),
name ( name ),
Expand Down Expand Up @@ -227,7 +227,7 @@ void CJamSession::DisconnectClient ( int iChID )
*/
void CJamSession::Frame ( const int iChID,
const QString name,
const CHostAddress address,
const CHostAddress& address,
const int numAudioChannels,
const CVector<int16_t> data,
int iServerFrameSizeSamples )
Expand Down Expand Up @@ -593,7 +593,7 @@ void CJamRecorder::OnDisconnected ( int iChID )
*/
void CJamRecorder::OnFrame ( const int iChID,
const QString name,
const CHostAddress address,
const CHostAddress& address,
const int numAudioChannels,
const CVector<int16_t> data )
{
Expand Down
6 changes: 3 additions & 3 deletions src/recorder/jamrecorder.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class CJamClient : public QObject
Q_OBJECT

public:
CJamClient ( const qint64 frame, const int numChannels, const QString name, const CHostAddress address, const QDir recordBaseDir );
CJamClient ( const qint64 frame, const int numChannels, const QString name, const CHostAddress& address, const QDir recordBaseDir );

void Frame ( const QString name, const CVector<int16_t>& pcm, int iServerFrameSizeSamples );

Expand Down Expand Up @@ -119,7 +119,7 @@ class CJamSession : public QObject

void Frame ( const int iChID,
const QString name,
const CHostAddress address,
const CHostAddress& address,
const int numAudioChannels,
const CVector<int16_t> data,
int iServerFrameSizeSamples );
Expand Down Expand Up @@ -214,7 +214,7 @@ public slots:
/**
* @brief Handle a frame of data to process
*/
void OnFrame ( const int iChID, const QString name, const CHostAddress address, const int numAudioChannels, const CVector<int16_t> data );
void OnFrame ( const int iChID, const QString name, const CHostAddress& address, const int numAudioChannels, const CVector<int16_t> data );
};

} // namespace recorder
Loading

0 comments on commit d6b9e43

Please sign in to comment.