From 3cab1bc0fe451c77dba9fe3fb5e7b4899e4ee1cb Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Fri, 10 Aug 2018 14:34:59 +0200 Subject: [PATCH] minor cleaning of ZmqSocket --- slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 2 -- slsReceiverSoftware/include/ZmqSocket.h | 7 ------- 2 files changed, 9 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index e39c49921..0e30cff42 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -4962,7 +4962,6 @@ void multiSlsDetector::readFrameFromReceiver() { rapidjson::Document doc; if (!zmqSocket[isocket]->ReceiveHeader(isocket, doc, SLS_DETECTOR_JSON_HEADER_VERSION)) { - // zmqSocket[isocket]->CloseHeaderMessage(); // parse error, version error or end of acquisition for socket runningList[isocket] = false; --numRunning; @@ -5023,7 +5022,6 @@ void multiSlsDetector::readFrameFromReceiver() { coordX, coordY, flippedDataX); #endif - // zmqSocket[isocket]->CloseHeaderMessage(); } // DATA diff --git a/slsReceiverSoftware/include/ZmqSocket.h b/slsReceiverSoftware/include/ZmqSocket.h index b00cb40d2..d1773099e 100644 --- a/slsReceiverSoftware/include/ZmqSocket.h +++ b/slsReceiverSoftware/include/ZmqSocket.h @@ -365,10 +365,6 @@ public: */ int ReceiveHeader(const int index, Document& document, uint32_t version) { - // zmq_msg_t message; - // headerMessage= &message; - // zmq_msg_init (&message); - // int len = ReceiveMessage(index, message); std::vectorbuffer(MAX_STR_LENGTH); int len = zmq_recv(sockfd.socketDescriptor, buffer.data(), buffer.size(),0); if ( len > 0 ) { @@ -593,7 +589,4 @@ private: /** Socket descriptor */ mySocketDescriptors sockfd; - - /** Header Message pointer */ - //zmq_msg_t* headerMessage; };