diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index 371dc5b30..a768c9a30 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -167,9 +167,9 @@ void Implementation::setDetectorType(const detectorType d) { auto fifo_ptr = fifo[i].get(); listener.push_back(sls::make_unique( i, detType, fifo_ptr, &status, &udpPortNum[i], ð[i], - &numberOfTotalFrames, &udpSocketBufferSize, - &actualUDPSocketBufferSize, &framesPerFile, &frameDiscardMode, - &activated, &detectorDataStream[i], &silentMode)); + &udpSocketBufferSize, &actualUDPSocketBufferSize, + &framesPerFile, &frameDiscardMode, &activated, + &detectorDataStream[i], &silentMode)); dataProcessor.push_back(sls::make_unique( i, detType, fifo_ptr, &activated, &dataStreamEnable, &streamingFrequency, &streamingTimerInMs, &streamingStartFnum, @@ -880,10 +880,9 @@ void Implementation::setNumberofUDPInterfaces(const int n) { auto fifo_ptr = fifo[i].get(); listener.push_back(sls::make_unique( i, detType, fifo_ptr, &status, &udpPortNum[i], ð[i], - &numberOfTotalFrames, &udpSocketBufferSize, - &actualUDPSocketBufferSize, &framesPerFile, - &frameDiscardMode, &activated, &detectorDataStream[i], - &silentMode)); + &udpSocketBufferSize, &actualUDPSocketBufferSize, + &framesPerFile, &frameDiscardMode, &activated, + &detectorDataStream[i], &silentMode)); listener[i]->SetGeneralData(generalData); dataProcessor.push_back(sls::make_unique( diff --git a/slsReceiverSoftware/src/Listener.cpp b/slsReceiverSoftware/src/Listener.cpp index 2e744bd8a..c1ed94185 100644 --- a/slsReceiverSoftware/src/Listener.cpp +++ b/slsReceiverSoftware/src/Listener.cpp @@ -23,10 +23,10 @@ const std::string Listener::TypeName = "Listener"; Listener::Listener(int ind, detectorType dtype, Fifo *f, std::atomic *s, uint32_t *portno, std::string *e, - uint64_t *nf, int *us, int *as, uint32_t *fpf, - frameDiscardPolicy *fdp, bool *act, bool *detds, bool *sm) + int *us, int *as, uint32_t *fpf, frameDiscardPolicy *fdp, + bool *act, bool *detds, bool *sm) : ThreadObject(ind, TypeName), fifo(f), myDetectorType(dtype), status(s), - udpPortNumber(portno), eth(e), numImages(nf), udpSocketBufferSize(us), + udpPortNumber(portno), eth(e), udpSocketBufferSize(us), actualUDPSocketBufferSize(as), framesPerFile(fpf), frameDiscardMode(fdp), activated(act), detectorDataStream(detds), silentMode(sm) { LOG(logDEBUG) << "Listener " << ind << " created"; diff --git a/slsReceiverSoftware/src/Listener.h b/slsReceiverSoftware/src/Listener.h index 7afafcf91..8cdc4b930 100644 --- a/slsReceiverSoftware/src/Listener.h +++ b/slsReceiverSoftware/src/Listener.h @@ -32,7 +32,6 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject { * @param s pointer to receiver status * @param portno pointer to udp port number * @param e ethernet interface - * @param nf pointer to number of images to catch * @param dr pointer to dynamic range * @param us pointer to udp socket buffer size * @param as pointer to actual udp socket buffer size @@ -43,9 +42,8 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject { * @param sm pointer to silent mode */ Listener(int ind, detectorType dtype, Fifo *f, std::atomic *s, - uint32_t *portno, std::string *e, uint64_t *nf, int *us, int *as, - uint32_t *fpf, frameDiscardPolicy *fdp, bool *act, bool *detds, - bool *sm); + uint32_t *portno, std::string *e, int *us, int *as, uint32_t *fpf, + frameDiscardPolicy *fdp, bool *act, bool *detds, bool *sm); /** * Destructor @@ -171,9 +169,6 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject { /** ethernet interface */ std::string *eth; - /** Number of Images to catch */ - uint64_t *numImages; - /** UDP Socket Buffer Size */ int *udpSocketBufferSize;