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

small merge fixes, fix a compiler warning

Browse Source
This commit is contained in:
Volker Fischer 2020-05-21 21:35:35 +02:00
parent fefd63f271
commit b959730d08
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/client.cpp
View File

@ -661,7 +661,7 @@ void CClient::OnCLChannelLevelListReceived ( CHostAddress InetAddr,
emit CLChannelLevelListReceived ( InetAddr, vecLevelList ); emit CLChannelLevelListReceived ( InetAddr, vecLevelList );
} }
void CClient::OnHandledSignal(int sigNum) void CClient::OnHandledSignal ( int sigNum )
{ {
#ifdef _WIN32 #ifdef _WIN32
// Windows does not actually get OnHandledSignal triggered // Windows does not actually get OnHandledSignal triggered
@ -670,7 +670,6 @@ void CClient::OnHandledSignal(int sigNum)
#else #else
switch ( sigNum ) switch ( sigNum )
{ {
case SIGINT: case SIGINT:
case SIGTERM: case SIGTERM:
// This should trigger OnAboutToQuit // This should trigger OnAboutToQuit

6
src/client.h
View File

@ -390,9 +390,10 @@ protected:
// for ping measurement // for ping measurement
CPreciseTime PreciseTime; CPreciseTime PreciseTime;
CSignalHandler* pSignalHandler; CSignalHandler* pSignalHandler;
public slots: public slots:
void OnHandledSignal ( int sigNum );
void OnSendProtMessage ( CVector<uint8_t> vecMessage ); void OnSendProtMessage ( CVector<uint8_t> vecMessage );
void OnInvalidPacketReceived ( CHostAddress RecHostAddr ); void OnInvalidPacketReceived ( CHostAddress RecHostAddr );
@ -420,9 +421,6 @@ public slots:
void OnCLChannelLevelListReceived ( CHostAddress InetAddr, void OnCLChannelLevelListReceived ( CHostAddress InetAddr,
CVector<uint16_t> vecLevelList ); CVector<uint16_t> vecLevelList );
private slots:
void OnHandledSignal ( int sigNum );
signals: signals:
void ConClientListMesReceived ( CVector<CChannelInfo> vecChanInfo ); void ConClientListMesReceived ( CVector<CChannelInfo> vecChanInfo );
void ChatTextReceived ( QString strChatText ); void ChatTextReceived ( QString strChatText );

2
src/server.cpp
View File

@ -746,7 +746,7 @@ void CServer::Stop()
void CServer::OnTimer() void CServer::OnTimer()
{ {
int i, j, iUnused; int i, j, iUnused;
int iClientFrameSizeSamples; int iClientFrameSizeSamples = 0; // initialize to avoid a compiler warning
OpusCustomDecoder* CurOpusDecoder; OpusCustomDecoder* CurOpusDecoder;
OpusCustomEncoder* CurOpusEncoder; OpusCustomEncoder* CurOpusEncoder;
unsigned char* pCurCodedData; unsigned char* pCurCodedData;