detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +02:00
Code Issues Actions Packages Releases Activity

modified users for new callback argument without filepointer

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-03-23 14:07:56 +01:00
parent bf57be309f
commit 6d4c0d0d46
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
users/mainReceiver.cpp
View File

@ -53,7 +53,7 @@ void AcquisitionFinished(uint64_t frames, void*p){
void GetData(uint64_t frameNumber, uint32_t expLength, uint32_t packetNumber, uint64_t bunchId, uint64_t timestamp, void GetData(uint64_t frameNumber, uint32_t expLength, uint32_t packetNumber, uint64_t bunchId, uint64_t timestamp,
uint16_t modId, uint16_t xCoord, uint16_t yCoord, uint16_t zCoord, uint32_t debug, uint16_t roundRNumber, uint8_t detType, uint8_t version, uint16_t modId, uint16_t xCoord, uint16_t yCoord, uint16_t zCoord, uint32_t debug, uint16_t roundRNumber, uint8_t detType, uint8_t version,
char* datapointer, uint32_t datasize, FILE* filedescriptor, void* p){ char* datapointer, uint32_t datasize, void* p){
PRINT_IN_COLOR (xCoord, PRINT_IN_COLOR (xCoord,
"%d GetData: \n" "%d GetData: \n"
@ -158,8 +158,10 @@ int main(int argc, char *argv[]) {
while(str.find("q") == string::npos) while(str.find("q") == string::npos)
cin>>str; cin>>str;
//stop tcp server thread, stop udp socket //stop tcp server thread, stop udp socket
for (int i = 0; i < NUM_RECEIVERS; ++i) for (int i = 0; i < NUM_RECEIVERS; ++i) {
cprintf(BLUE,"Stopping Receiver %d\n",i);
receivers[i]->stop(); receivers[i]->stop();
}
deleteReceiver(receivers); deleteReceiver(receivers);

BIN
users/userReceiver
View File

Binary file not shown.