diff --git a/slsReceiverSoftware/slsReceiver/slsReceiver.cpp b/slsReceiverSoftware/slsReceiver/slsReceiver.cpp index 9491c3a92..72e9bf7fb 100644 --- a/slsReceiverSoftware/slsReceiver/slsReceiver.cpp +++ b/slsReceiverSoftware/slsReceiver/slsReceiver.cpp @@ -43,18 +43,21 @@ int64_t slsReceiver::getReceiverVersion(){ void slsReceiver::registerCallBackStartAcquisition(int (*func)(char*, char*,int, int, void*),void *arg){ - tcpipInterface->registerCallBackStartAcquisition(func,arg); + //tcpipInterface + receiverBase->registerCallBackStartAcquisition(func,arg); } void slsReceiver::registerCallBackAcquisitionFinished(void (*func)(int, void*),void *arg){ - tcpipInterface->registerCallBackAcquisitionFinished(func,arg); + //tcpipInterface + receiverBase->registerCallBackAcquisitionFinished(func,arg); } void slsReceiver::registerCallBackRawDataReady(void (*func)(int, char*, int, FILE*, char*, void*),void *arg){ - tcpipInterface->registerCallBackRawDataReady(func,arg); + //tcpipInterface + receiverBase->registerCallBackRawDataReady(func,arg); } diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.h b/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.h index 9ceacb21e..d4c1681b5 100644 --- a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.h +++ b/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.h @@ -51,44 +51,44 @@ public: /** gets version */ int64_t getReceiverVersion(); - /** - callback arguments are - filepath - filename - fileindex - data size +/* /\** */ +/* callback arguments are */ +/* filepath */ +/* filename */ +/* fileindex */ +/* data size */ - return value is - 0 callback takes care of open,close,wrie file - 1 callback writes file, we have to open, close it - 2 we open, close, write file, callback does not do anything +/* return value is */ +/* 0 callback takes care of open,close,wrie file */ +/* 1 callback writes file, we have to open, close it */ +/* 2 we open, close, write file, callback does not do anything */ - */ +/* *\/ */ - void registerCallBackStartAcquisition(int (*func)(char*, char*,int, int, void*),void *arg){receiverBase->registerCallBackStartAcquisition(func,arg);};; +/* void registerCallBackStartAcquisition(int (*func)(char*, char*,int, int, void*),void *arg){receiverBase->registerCallBackStartAcquisition(func,arg);};; */ - /** - callback argument is - toatal farmes caught +/* /\** */ +/* callback argument is */ +/* toatal farmes caught */ - */ +/* *\/ */ - void registerCallBackAcquisitionFinished(void (*func)(int, void*),void *arg){receiverBase->registerCallBackAcquisitionFinished(func,arg);}; +/* void registerCallBackAcquisitionFinished(void (*func)(int, void*),void *arg){receiverBase->registerCallBackAcquisitionFinished(func,arg);}; */ - /** - args to raw data ready callback are - framenum - datapointer - datasize in bytes - file descriptor - guidatapointer (NULL, no data required) - */ +/* /\** */ +/* args to raw data ready callback are */ +/* framenum */ +/* datapointer */ +/* datasize in bytes */ +/* file descriptor */ +/* guidatapointer (NULL, no data required) */ +/* *\/ */ - void registerCallBackRawDataReady(void (*func)(int, char*, int, FILE*, char*, void*),void *arg){receiverBase->registerCallBackRawDataReady(func,arg);}; +/* void registerCallBackRawDataReady(void (*func)(int, char*, int, FILE*, char*, void*),void *arg){receiverBase->registerCallBackRawDataReady(func,arg);}; */ private: