From fd34bab34b2c94c05edf6f6fb58b246ac5d4be74 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Wed, 15 Nov 2017 17:19:07 +0100 Subject: [PATCH] in between separating datastreaming in client and receiver --- .../multiSlsDetector/multiSlsDetector.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 4d698604f..6e53af4af 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -3690,8 +3690,13 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){ // disable data streaming before changing zmq port (but only if they were on) int prev_streaming = 0; + switch (p) { + case RECEIVER_STREAMING_PORT: + prev_streaming = enableDataStreamingFromReceiver(); + enableDataStreamingFromReceiver(0); + } if (p == RECEIVER_STREAMING_PORT || p == CLIENT_STREAMING_PORT) { - prev_streaming = getStreamingSocketsCreatedInClient(); + prev_streaming = enableDataStreamingToClient(); enableDataStreamingFromReceiver(0); } @@ -6150,7 +6155,7 @@ int multiSlsDetector::setReceiverReadTimer(int time_in_ms){ return ret; } -int multiSlsDetector::getStreamingSocketsCreatedInClient() { +int multiSlsDetector::enableDataStreamingToClient() { return dataSocketsStarted; }