merge with 3.0.1 conflicts resolved

This commit is contained in:
Dhanya Maliakal
2017-10-03 14:52:53 +02:00
20 changed files with 219 additions and 28 deletions

View File

@@ -51,6 +51,12 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
*/
static void ResetRunningMask();
/**
* Set Silent Mode
* @param mode 1 sets 0 unsets
*/
static void SetSilentMode(bool mode);
//*** non static functions ***
//*** getters ***
@@ -179,6 +185,11 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
/** Fifo structure */
Fifo* fifo;
/** Silent Mode */
static bool SilentMode;
/** ZMQ Socket - Receiver to Client */
ZmqSocket* zmqSocket;