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

take care of NewConnection message in the socket context

Browse Source
This commit is contained in:
Volker Fischer 2014-02-13 21:03:33 +00:00
parent 033e3adca4
commit 51db9e742a
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/channel.h
View File

@ -215,6 +215,8 @@ protected:
int iNumAudioChannels;
QMutex Mutex;
QMutex MutexSocketBuf;
QMutex MutexConvBuf;
public slots:
void OnSendProtMessage ( CVector<uint8_t> vecMessage );
@ -239,6 +241,11 @@ void OnDetectedCLMessage ( CVector<uint8_t> vecbyMesBodyData,
{
emit DetectedCLMessage ( vecbyMesBodyData, iRecID );
}
void OnNewConnection()
{
emit NewConnection();
}
#endif
signals:

3
src/socket.cpp
View File

@ -126,6 +126,9 @@ QObject::connect ( this,
SIGNAL ( DetectedCLMessage ( CVector<uint8_t>, int ) ),
pChannel, SLOT ( OnDetectedCLMessage ( CVector<uint8_t>, int ) ) );
QObject::connect ( this,
SIGNAL ( NewConnection ( CVector<uint8_t>, int ) ),
pChannel, SLOT ( OnNewConnection ( CVector<uint8_t>, int ) ) );
}
else

7
src/socket.h
View File

@ -95,6 +95,11 @@ public:
{
emit ParseMessageBody ( vecbyMesBodyData, iRecCounter, iRecID );
}
void EmitNewConnection()
{
emit NewConnection();
}
#endif
protected:
@ -134,6 +139,8 @@ signals:
void ParseMessageBody ( CVector<uint8_t> vecbyMesBodyData,
int iRecCounter,
int iRecID );
void NewConnection();
#endif
void InvalidPacketReceived ( CVector<uint8_t> vecbyRecBuf,
int iNumBytesRead,