comparison core/ReceiveAudioThread.cpp @ 132:e24c531220ee scope-refactoring

Added some sort of synchronization, not working great though

     if(listening==false || bufferReady==false)
         return 0;
     if(writePointer<0)
         return 0;
     if(socket.waitUntilReady(true, waitForSocketTime)){// TODO: if waitForSocketTime here is >>5, the
+#ifdef USE_JUCE
+#else
+		lastTime=rt_timer_read();
+//        rt_printf("lastTimeread= %llu\n", lastTime);
+#endif /* USE_JUCE */
     	// destructor (always or sometimes) never actually gets called, despite run() returns ...see issue #1381
         pushPayload(writePointer); //backup headerLength samples. This could be skipped if writePointer==0
         //read header+payload
         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(channel!=(int)buffer[writePointer]){
 //        	printf("I am channel %d, but I received data for channel %d\n", channel, (int)buffer[writePointer]);
         	return -5;
         }
-        static int timestamp=0;
         if(buffer[writePointer+1]!=timestamp+1)
         	printf("missing a timestamp: %d\n",timestamp+1);
         timestamp=buffer[writePointer+1];
 //        rt_printf("Received a message of length %d, it was on channel %d and timestamp %d\n", numBytes, (int)buffer[writePointer], (int)buffer[writePointer+1]);
 

   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
+  timestamp=0;
 #ifdef USE_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 /* USE_JUCE */

 	threadIsExiting=true;
 }
 bool ReceiveAudioThread::threadShouldExit(){
 	return(gShouldStop || threadIsExiting );
 }
-#endif /* USE_JUCE */
+RTIME ReceiveAudioThread::getLastTime(){
+	return lastTime;
+}
+#endif /* USE_JUCE */
+int ReceiveAudioThread::getTimestamp(){
+	return timestamp;
+}
 void ReceiveAudioThread::run(){
     //  fd2=fopen("buffer.m","w"); //DEBUG
     //  fprintf(fd2, "buf=["); //DEBUG
 	threadRunning=true;
 	int maxCount=10;