comparison core/ReceiveAudioThread.cpp @ 122:bc514f29c3aa scope-refactoring

ReceiveAudioThread updated to match the newest UdpServer

     buffer=NULL;
     free(stackBuffer);
     stackBuffer=NULL;
 }
 void ReceiveAudioThread::wrapWritePointer(){
-    //this is not quite a simple wrapping as you wold in a circular buffer,
+    //this is not quite a simple wrapping as you would do in a circular buffer,
     //as there is no guarantee the buffer will be full at all times, given that there must alwas be enough space at the end of it
     //to hold a full payload
     // lastValidPointer indicates the last pointer in the buffer containing valid data
     //
     if(writePointer+payloadLength+headerLength>bufferLength){ //if we are going to exceed the length of the buffer with the next reading

 int ReceiveAudioThread::readUdpToBuffer(){
     if(listening==false || bufferReady==false)
         return 0;
     if(writePointer<0)
         return 0;
-    if(1){ //TODO: implement waitUntilReady for UdpServer
-//JUCE    if(socket.waitUntilReady(true, waitForSocketTime)){ // waitForSocketTime could have been set to -1 (wait forever),
+    if(socket.waitUntilReady(true, waitForSocketTime)){ // waitForSocketTime could have been set to -1 (wait forever),
                                                         // but it would have made it more difficult for the thread to be killed
         pushPayload(writePointer); //backup headerLength samples. This could be skipped if writePointer==0
         //read header+payload
 //JUCE        int numBytes=socket.read(buffer+writePointer, bytesToRead,1);
-        int numBytes=socket.read(buffer+writePointer, bytesToRead);
+        int numBytes=socket.read(buffer+writePointer, bytesToRead, false); //read without waiting.
             //TODO: (if using variable-length payload) validate the actual numBytes read against the size declared in the header
         if(numBytes<0){
             printf("error numBytes1\n");
             return -3; //TODO: something went wrong, you have to discard the rest of the packet!
         }

 }
 bool ReceiveAudioThread::isBufferReady(){
     return bufferReady;
 }
 void ReceiveAudioThread::startThread(){
+	printf("receivedata is going to be  scheduled\n");
 	BeagleRT_scheduleAuxiliaryTask(receiveDataTask);
+	printf("receivedata has been scheduled\n");
 }
 void ReceiveAudioThread::stopThread(){
 	threadIsExiting=true;
 }
 bool ReceiveAudioThread::threadShouldExit(){

 #ifdef JUCE
         readUdpToBuffer(); // read into the oldBuffer
         usleep(sleepTime);
 #else
 		for(unsigned int n=0; n<ReceiveAudioThread::objAddrs.size(); n++){
+//			printf("%d\n", n);
 			ReceiveAudioThread::objAddrs[n]->readUdpToBuffer();
 		}
 		usleep(sleepTime); //TODO: use rt_task_sleep instead
 #endif
     }