From 6d4c0d0d463da7537ea09aba6ba76fcd8a8343af Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 23 Mar 2017 14:07:56 +0100 Subject: [PATCH] modified users for new callback argument without filepointer --- users/mainReceiver.cpp | 6 ++++-- users/userReceiver | Bin 13780 -> 13808 bytes 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/users/mainReceiver.cpp b/users/mainReceiver.cpp index ac9a02166..8c3f90e7d 100644 --- a/users/mainReceiver.cpp +++ b/users/mainReceiver.cpp @@ -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, 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, "%d GetData: \n" @@ -158,8 +158,10 @@ int main(int argc, char *argv[]) { while(str.find("q") == string::npos) cin>>str; //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(); + } deleteReceiver(receivers); diff --git a/users/userReceiver b/users/userReceiver index 2e1fe78864490ca3f6ae7a8e29a2bd26db4ed2ae..ef9aa600006ae28fd129ddb01c8ab6da716d9f65 100755 GIT binary patch delta 4488 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