removed callbacks from tcpip interface

This commit is contained in:
bergamaschi 2014-07-18 12:57:10 +02:00
parent b957cae85f
commit 4f04fc5457
2 changed files with 32 additions and 29 deletions

View File

@ -43,18 +43,21 @@ int64_t slsReceiver::getReceiverVersion(){
void slsReceiver::registerCallBackStartAcquisition(int (*func)(char*, char*,int, int, void*),void *arg){ 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){ 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){ void slsReceiver::registerCallBackRawDataReady(void (*func)(int, char*, int, FILE*, char*, void*),void *arg){
tcpipInterface->registerCallBackRawDataReady(func,arg); //tcpipInterface
receiverBase->registerCallBackRawDataReady(func,arg);
} }

View File

@ -51,44 +51,44 @@ public:
/** gets version */ /** gets version */
int64_t getReceiverVersion(); int64_t getReceiverVersion();
/** /* /\** */
callback arguments are /* callback arguments are */
filepath /* filepath */
filename /* filename */
fileindex /* fileindex */
data size /* data size */
return value is /* return value is */
0 callback takes care of open,close,wrie file /* 0 callback takes care of open,close,wrie file */
1 callback writes file, we have to open, close it /* 1 callback writes file, we have to open, close it */
2 we open, close, write file, callback does not do anything /* 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 /* callback argument is */
toatal farmes caught /* 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 /* args to raw data ready callback are */
framenum /* framenum */
datapointer /* datapointer */
datasize in bytes /* datasize in bytes */
file descriptor /* file descriptor */
guidatapointer (NULL, no data required) /* 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: private: