comparison core/ReceiveAudioThread.cpp @ 125:850a4a9bd832 scope-refactoring

Added ifdefs and unified the code with udpioplugin ... the latter has not been tested (or committed). TODO: still it hangs after ctrl-c BeagleRT (auxiliary tasks do not terminate). TODO: sometimes you can hear dropouts in the transmission. Maybe it is due to pointer drifting. Rebooting BBB fixes/affects this issue.

 		return;
 	staticConstructed=true;
     threadIsExiting=false;
 	receiveDataTask=BeagleRT_createAuxiliaryTask(receiveData, 90, "receiveDataTask"); //TODO: allow different priorities
 }
-#endif
+#endif /* JUCE */
 
 void ReceiveAudioThread::dealloc(){
     free(buffer);
     buffer=NULL;
     free(stackBuffer);

     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, false); //read without waiting.
+        int numBytes=socket.read(buffer+writePointer, bytesToRead, true); //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!
         }
-        if(numBytes==0){//TODO: when inplementing waitUntilReady, this should not happen unless you actually receive a packate of size zero (is it at all possible?)
+        if(numBytes==0){//TODO: this should not happen unless you actually receive a packet of size zero (is it at all possible?)
 //        	printf("received 0 bytes\n");
         	return 0;
         }
         if(numBytes != bytesToRead){ //this is equivalent to (numBytes<bytesToRead)
             printf("error numBytes2: %d\n", numBytes);

         wrapWritePointer();
         return numBytes;
     }
     return 0; //timeout occurred
 }
+//JUCE    Thread(threadName),
+#ifdef JUCE
+ReceiveAudioThread::ReceiveAudioThread(const String &threadName) :
+			Thread(threadName),
+#else
 ReceiveAudioThread::ReceiveAudioThread() :
-//JUCE    Thread(threadName),
-    socket(0),
+#endif /* JUCE */
+	socket(NULL),
     listening(false),
     bufferReady(false),
     buffer(NULL),
     stackBuffer(NULL),
     bufferLength(0),
     lastValidPointer(0),
     waitForSocketTime(100),
-    threadPriority(95)
+#ifdef JUCE
+    threadPriority(5)
+#else
+    threadPriority(88)
+#endif /* JUCE */
 {};
 ReceiveAudioThread::~ReceiveAudioThread(){
-//JUCE    stopThread(1000);
+#ifdef JUCE
+	stopThread(1000);
+#else
+	printf("inside the destructor\n");
 	while(threadRunning){
+		printf("while in the destructor\n");
 		usleep(sleepTime*2);	//wait for thread to stop
 		std::cout<< "Waiting for receiveAudioTask to stop" << std::endl;
 	}
+#endif /* JUCE */
 	//TODO: check if thread stopped, otherwise kill it before dealloc
+	printf("dealloc\n");
     dealloc();
 }
 void ReceiveAudioThread::init(int aPort, int aSamplesPerBlock, int aChannel){
   dealloc();
 #ifdef JUCE
 #else
   staticConstructor();
   objAddrs.push_back(this);//TODO: this line should be in the constructor
-#endif
+#endif /* JUCE */
   bindToPort(aPort);
   channel=aChannel;
   printf("Channel %d is receiving on port %d\n",aChannel, aPort);
   //  fd=fopen("output.m","w"); //DEBUG
   //  fprintf(fd,"var=["); //DEBUG

   bufferLength=std::max(headerLength+(payloadLength*4), headerLength+(aSamplesPerBlock*4)); //there are many considerations that can be done here ...
                       //We keep a headerLength padding at the beginning of the array to allow full reads from the socket
   buffer=(float*)malloc(sizeof(float)*bufferLength);
   if(buffer==NULL) // something wrong
     return;
-  bufferReady=true;
   lastValidPointer=headerLength+ ((bufferLength-headerLength)/payloadLength)*payloadLength;
   memset(buffer,0,bufferLength*sizeof(float));
   stackBuffer=(float*)malloc(sizeof(float)*headerLength);
+  if(stackBuffer==NULL) // something wrong
+      return;
+  bufferReady=true;
   bytesToRead=sizeof(float)*(payloadLength + headerLength);
   writePointer=-1;
   readPointer=0;
   sleepTime=payloadLength/(float)44100 /4.0; //set sleepTime so that you do not check too often or too infrequently
-//JUCE    startThread(threadPriority);
+#ifdef JUCE
+  startThread(threadPriority);
+#else
+  //TODO: the thread cannot be started here at the moment because init() is called in setup(), where tasks cannot be scheduled
+#endif /* JUCE */
 }
 
 void ReceiveAudioThread::bindToPort(int aPort){
     listening=socket.bindToPort(aPort);
 #ifdef JUCE
 #else
-    if(listening==false)
+    if(listening==false) //this condition is valid also for JUCE, but we do not printf in JUCE
     	printf("Could not bind to port %d\n",aPort);
-#endif
+#endif /* JUCE */
 }
 bool ReceiveAudioThread::isListening(){
     return listening;
 }
 float* ReceiveAudioThread::getCurrentBuffer(int length){ // NOTE: this cannot work all the time unless samplesPerBuffer and payloadLength are multiples

         readPointer+=samplingRateRatio;
         if((int)(0.5+readPointer)>=lastValidPointer){
             readPointer=readPointer-lastValidPointer+headerLength;
         }
     }
-    return readPointer; 
+    return length;
 }
 int ReceiveAudioThread::getSamplesSrc(float *destination, int length, float samplingRateRatio){
 	return getSamplesSrc(destination, length, samplingRateRatio, 1,0);
 	// TODO: rewriting this so that it does not call the override method we can save a multiply and add
 	// for each sample.
 }
 bool ReceiveAudioThread::isBufferReady(){
     return bufferReady;
 }
+#ifdef JUCE
+#else
 void ReceiveAudioThread::startThread(){
 	printf("receivedata is going to be  scheduled\n");
 	BeagleRT_scheduleAuxiliaryTask(receiveDataTask);
 	printf("receivedata has been scheduled\n");
 }

 	threadIsExiting=true;
 }
 bool ReceiveAudioThread::threadShouldExit(){
 	return(gShouldStop || threadIsExiting );
 }
+#endif /* JUCE */
 void ReceiveAudioThread::run(){
     //  fd2=fopen("buffer.m","w"); //DEBUG
     //  fprintf(fd2, "buf=["); //DEBUG
 	threadRunning=true;
     while(!threadShouldExit()){ //TODO: check that the socket buffer is empty before starting

 		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
+#endif /* JUCE */
     }
     threadRunning=false;
+    printf("Thread is not running \n");
     //  fprintf(fd,"];readPointer,writePointer,lastValidPointer,destination]=deal(var(:,1), var(:,2), var(:,3), var(:,4));"); //DEBUG
     //  fclose(fd);//DEBUG
     //  fprintf(fd2,"];");//DEBUG
     //  fclose(fd2); //DEBUG
 }