From a9c0e243ddd6d6ba1765401fb3099e0f37c6fc0c Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Tue, 11 Feb 2014 20:21:32 +0000 Subject: [PATCH] fix compilation errors under Linux --- src/channel.cpp | 4 ++-- src/socket.h | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/channel.cpp b/src/channel.cpp index dd76b837..ea1623b3 100755 --- a/src/channel.cpp +++ b/src/channel.cpp @@ -489,7 +489,7 @@ EPutDataStat CChannel::PutData ( const CVector& vecbyData, // message // TODO a copy of the vector is used -> avoid malloc in real-time routine #ifdef ENABLE_RECEIVE_SOCKET_IN_SEPARATE_THREAD - emit pSocket->DetectedCLMessage ( vecbyMesBodyData, iRecID ); + pSocket->EmitDetectedCLMessage ( vecbyMesBodyData, iRecID ); #else emit DetectedCLMessage ( vecbyMesBodyData, iRecID ); #endif @@ -502,7 +502,7 @@ EPutDataStat CChannel::PutData ( const CVector& vecbyData, // parse the message assuming this is a regular protocol message // TODO a copy of the vector is used -> avoid malloc in real-time routine #ifdef ENABLE_RECEIVE_SOCKET_IN_SEPARATE_THREAD - emit pSocket->ParseMessageBody ( vecbyMesBodyData, iRecCounter, iRecID ); + pSocket->EmitParseMessageBody ( vecbyMesBodyData, iRecCounter, iRecID ); #else emit ParseMessageBody ( vecbyMesBodyData, iRecCounter, iRecID ); #endif diff --git a/src/socket.h b/src/socket.h index dcf9108a..94bc66a3 100755 --- a/src/socket.h +++ b/src/socket.h @@ -74,11 +74,30 @@ public: bool GetAndResetbJitterBufferOKFlag(); +#ifdef ENABLE_RECEIVE_SOCKET_IN_SEPARATE_THREAD + void EmitDetectedCLMessage ( const CVector& vecbyMesBodyData, + const int iRecID ) + { + emit DetectedCLMessage ( vecbyMesBodyData, iRecID ); + } + + void EmitParseMessageBody ( const CVector& vecbyMesBodyData, + const int iRecCounter, + const int iRecID ) + { + emit ParseMessageBody ( vecbyMesBodyData, iRecCounter, iRecID ); + } +#endif + protected: void Init ( const quint16 iPortNumber = LLCON_DEFAULT_PORT_NUMBER ); #ifdef ENABLE_RECEIVE_SOCKET_IN_SEPARATE_THREAD +# ifdef _WIN32 SOCKET UdpSocket; +# else + int UdpSocket; +# endif #endif QUdpSocket SocketDevice;