merge conflict to include datastreaming in client comment

This commit is contained in:
Dhanya Maliakal
2017-11-23 10:29:08 +01:00

View File

@ -73,8 +73,10 @@ int main(int argc, char **argv) {
pDetector->registerDataCallback(&dataCallback, NULL);
/** - if receiver exists, enable data streaming from receiver to get the data */
pDetector->enableDataStreamingFromReceiver(1);
/** - create zmq sockets in client to enable data streaming in of data from receiver/different process */
pDetector->enableDataStreamingToClient(1);
/** - ensuring detector status is idle before starting acquisition. exiting if not idle */
int status = pDetector->getDetectorStatus();
if (status != 0){