From 51db9e742a88132ef6dda336b886cbfd0c184a15 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Thu, 13 Feb 2014 21:03:33 +0000 Subject: [PATCH] take care of NewConnection message in the socket context --- src/channel.h | 7 +++++++ src/socket.cpp | 3 +++ src/socket.h | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/src/channel.h b/src/channel.h index d36042ea..4260149c 100755 --- a/src/channel.h +++ b/src/channel.h @@ -215,6 +215,8 @@ protected: int iNumAudioChannels; QMutex Mutex; + QMutex MutexSocketBuf; + QMutex MutexConvBuf; public slots: void OnSendProtMessage ( CVector vecMessage ); @@ -239,6 +241,11 @@ void OnDetectedCLMessage ( CVector vecbyMesBodyData, { emit DetectedCLMessage ( vecbyMesBodyData, iRecID ); } + +void OnNewConnection() +{ + emit NewConnection(); +} #endif signals: diff --git a/src/socket.cpp b/src/socket.cpp index 8534861b..142b18e2 100755 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -126,6 +126,9 @@ QObject::connect ( this, SIGNAL ( DetectedCLMessage ( CVector, int ) ), pChannel, SLOT ( OnDetectedCLMessage ( CVector, int ) ) ); +QObject::connect ( this, + SIGNAL ( NewConnection ( CVector, int ) ), + pChannel, SLOT ( OnNewConnection ( CVector, int ) ) ); } else diff --git a/src/socket.h b/src/socket.h index f0c06ef3..4e3c8df1 100755 --- a/src/socket.h +++ b/src/socket.h @@ -95,6 +95,11 @@ public: { emit ParseMessageBody ( vecbyMesBodyData, iRecCounter, iRecID ); } + + void EmitNewConnection() + { + emit NewConnection(); + } #endif protected: @@ -134,6 +139,8 @@ signals: void ParseMessageBody ( CVector vecbyMesBodyData, int iRecCounter, int iRecID ); + + void NewConnection(); #endif void InvalidPacketReceived ( CVector vecbyRecBuf, int iNumBytesRead,