comparison core/ReceiveAudioThread.cpp @ 120:cdd441a304a9 scope-refactoring

Added read to interleaved buffer

   staticConstructor();
   objAddrs.push_back(this);//TODO: this line should be in the constructor
 #endif
   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
   headerLength=2;
   payloadLength=300; //TODO: make sure that payloadLength and headerLength are the same as the client is sending.
   bufferLength=std::max(headerLength+(payloadLength*4), headerLength+(aSamplesPerBlock*4)); //there are many considerations that can be done here ...

   lastValidPointer=headerLength+ ((bufferLength-headerLength)/payloadLength)*payloadLength;
   memset(buffer,0,bufferLength*sizeof(float));
   stackBuffer=(float*)malloc(sizeof(float)*headerLength);
   bytesToRead=sizeof(float)*(payloadLength + headerLength);
   writePointer=-1;
-  readPointer=0; //TODO: this *4 is sortof a security margin
+  readPointer=0;
   sleepTime=payloadLength/(float)44100 /4.0; //set sleepTime so that you do not check too often or too infrequently
 //JUCE    startThread(threadPriority);
 }
 
 void ReceiveAudioThread::bindToPort(int aPort){

     if(readPointer>lastValidPointer){
         readPointer=headerLength;
     }
     return buffer+(int)readPointer;
 };
-int ReceiveAudioThread::getSamplesSrc(float *destination, int length, float samplingRateRatio){//TODO: add interleaved version
+int ReceiveAudioThread::getSamplesSrc(float *destination, int length,
+		float samplingRateRatio, int numChannelsInDestination,
+		int channelToWriteTo)
+{
     if (!(samplingRateRatio>0 && samplingRateRatio<=2))
         return -2;
     if(isListening()==false)
         return -1;
     if(writePointer<0){ //if writePointer has not been initalized yet ...

         length=lastValidPointer-payloadLength-headerLength;
         if(length<0) //no samples available at all! 
             return 0;
     }
     for(int n=0; n<length; n++){
-        destination[n]=buffer[(int)(0.5+readPointer)];//simple ZOH non-interpolation (nearest neighbour)
+        destination[n*numChannelsInDestination+channelToWriteTo]=buffer[(int)(0.5+readPointer)];//simple ZOH non-interpolation (nearest neighbour)
         //  fprintf(fd,"%f, %d, %f;\n",readPointer,writePointer,destination[n]); //DEBUG
         readPointer+=samplingRateRatio;
         if((int)(0.5+readPointer)>=lastValidPointer){
             readPointer=readPointer-lastValidPointer+headerLength;
         }
     }
     return readPointer; 
 }
-
+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;
 }
 void ReceiveAudioThread::startThread(){
 	BeagleRT_scheduleAuxiliaryTask(receiveDataTask);