detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 21:37:13 +02:00
Code Issues Actions Packages Releases Activity

merge conflict from 3.0.1 to restream stop from recieveR

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-30 19:05:47 +01:00
parent e17e4c3171 70bf6eb4cb
commit 6f3898441e
10 changed files with 102 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsReceiverSoftware/include/DataStreamer.h
View File

@ -117,6 +117,12 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
*/
void CloseZmqSocket();
/**
* Restream stop dummy packet
* @return OK or FAIL
*/
int restreamStop();
private:
/**