comparison core/NetworkSend.cpp @ 220:46bd63a50933 mergingClockSync

Fixed initialization of writePointer

 						//because of limitations in BeagleRT_createAuxiliaryTask()
 	//keep track of added active instances
 	objAddrs.push_back(this);//TODO: this line should be in the constructor, but something weird happens if
 	// an instance of NetworkSend is then declared globally: the constructor gets called,
 	// and objAddrs.size()==1 but when you get to setup, objAddrs.size() has reverted back to 0, without
-	// any destructor being called in between ...
+	// any destructor being called in between ... Have a look here
+	// http://stackoverflow.com/questions/7542054/global-vector-emptying-itself-between-calls .
+	// and maybe use accessor function instead of global, as was done in #1374
 #endif /* USE_JUCE */
 	cleanup();
 	int numSamples=blockSize*4>4*channel.bufferLength ? blockSize*4 : 4*channel.bufferLength;
 	channel.numBuffers= 1+numSamples/channel.bufferLength; //the +1 takes the ceil() of the division
 	channel.buffers=(float**)malloc(channel.numBuffers*sizeof(float*));

 		channel.readyToBeSent[n]=false;
 		channel.doneOnTime[n]=true;
 	}
 	if(channel.readyToBeSent==NULL || channel.doneOnTime==NULL)
 		return;
-	channel.writePointer=0;
+	channel.writePointer=channel.headerLength;
 	channel.writeBuffer=0;
 	channel.readBuffer=0;
 	setChannelNumber(aChannelNumber);
 	setPort(aPort); //TODO: check for the return value
 	setServer(aServer); //TODO: check for the return value

 		channel.writeBuffer=(channel.writeBuffer+1); //switch buffer
 		if(channel.writeBuffer==channel.numBuffers) // and wrap it
 			channel.writeBuffer=0;
 //		printf("WriteBuffer:%d\n", channel.writeBuffer);
 		if(channel.doneOnTime[channel.writeBuffer]==false){ //check if this buffer's last sending has completed on time ...
-			printf("Network buffer underrun. timestamp: %d :-{\n",
+			printf("NetworkSend buffer underrun. timestamp: %d :-{\n",
 					(int)channel.buffers[channel.writeBuffer][channel.headerTimestampIndex]);
 		}
 		channel.doneOnTime[channel.writeBuffer]=false; // ... and then reset the flag
 #ifdef USE_JUCE
 		if(isThreadRunning()==false){

 #endif /* USE_JUCE */
 }
 
 void NetworkSend::setChannelNumber(int aChannelNumber){
 	channel.channelNumber=aChannelNumber;
-	for(int n=0; n<channel.numBuffers; n++){ //initialize the header
+	for(int n=0; n < channel.numBuffers; n++){ //initialize the header
 		channel.buffers[n][channel.headerChannelIndex]=channel.channelNumber;
 		//add here more static header fields
 	}
 };
 int NetworkSend::getChannelNumber(){

 		} else {
 			//  printf ("Not ready timestamp: %d\n", (int)((float*)sourceBuffer)[1]);
 		}
 #else
 		udpClient.send(sourceBuffer, numBytesToSend);
+//		printf("sent sourceBuffer: %d, channel: %f, timestamp: %f\n", channel.readBuffer, channel.buffers[channel.readBuffer][0],
+//				channel.buffers[channel.readBuffer][1]);
 		channel.doneOnTime[channel.readBuffer]=true;
 #endif /* USE_JUCE */
 		channel.readBuffer++;
 		if(channel.readBuffer==channel.numBuffers)
 			channel.readBuffer=0;