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

in between separating datastreaming in client and receiver

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-15 17:19:07 +01:00
parent 2b0d07387a
commit fd34bab34b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3690,8 +3690,13 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
// disable data streaming before changing zmq port (but only if they were on) // disable data streaming before changing zmq port (but only if they were on)
int prev_streaming = 0; int prev_streaming = 0;
switch (p) {
case RECEIVER_STREAMING_PORT:
prev_streaming = enableDataStreamingFromReceiver();
enableDataStreamingFromReceiver(0);
}
if (p == RECEIVER_STREAMING_PORT || p == CLIENT_STREAMING_PORT) { if (p == RECEIVER_STREAMING_PORT || p == CLIENT_STREAMING_PORT) {
prev_streaming = getStreamingSocketsCreatedInClient(); prev_streaming = enableDataStreamingToClient();
enableDataStreamingFromReceiver(0); enableDataStreamingFromReceiver(0);
} }
@ -6150,7 +6155,7 @@ int multiSlsDetector::setReceiverReadTimer(int time_in_ms){
return ret; return ret;
} }
int multiSlsDetector::getStreamingSocketsCreatedInClient() { int multiSlsDetector::enableDataStreamingToClient() {
return dataSocketsStarted; return dataSocketsStarted;
} }