comparison core/NetworkSend.cpp @ 116:8341df5e404b scope-refactoring

Refactoring

 #define NETWORK_AUDIO_BUFFER_SIZE 302
 
 //initialize the static members of NetworkSend
 bool NetworkSend::staticConstructed=false;
 std::vector<NetworkSend*> NetworkSend::objAddrs(0);
-AuxiliaryTask NetworkSend::transmitAudioTask=NULL;
+AuxiliaryTask NetworkSend::sendDataTask=NULL;
 
 void transmitAudio(){
 	NetworkSend::sendAllData();
 }
 

 
 void NetworkSend::staticConstructor(){
 	if(staticConstructed==true)
 		return;
 	staticConstructed=true;
-	transmitAudioTask = BeagleRT_createAuxiliaryTask(transmitAudio, 95, "transmitAudioTask"); //TODO: allow variable priority
+	sendDataTask = BeagleRT_createAuxiliaryTask(transmitAudio, 95, "sendDataTask"); //TODO: allow variable priority
 };
 
 NetworkSend::NetworkSend()
 {
 	sampleCount = 0;
 	channel.doneOnTime=true;
 	channel.index=channel.headerLength; //leave space for the heading message (channel, timestamp)
 	channel.activeBuffer=0;
 	channel.readyToBeSent=false;
 }
+
 NetworkSend::~NetworkSend(){
 	for(unsigned int n=0; n<objAddrs.size(); n++){ //keep track of deleted instances;
 		if(objAddrs[n]==this){
 			objAddrs.erase(objAddrs.begin()+n);
 			break;

 	setPort(aPort);
 	setServer(aServer);
 	printf("Channel %d is sending messages to : %s:%d at %fHz\n", getChannelNumber(), aServer, aPort, aSampleRate);
 }
 
-
 void NetworkSend::log(float value){ //TODO: add a vectorized version of this method
 	if(channel.index==(NETWORK_AUDIO_BUFFER_SIZE)){ // when the buffer is ready ...
 		channel.readyToBeSent=true;
 		channel.index=channel.headerLength; //reset the counter
 		if(channel.doneOnTime==false){
 			printf("Network buffer underrun. timestamp: %d :-{\n", (int)channel.buffers[!channel.activeBuffer][1]);
 		}
 		channel.activeBuffer=!channel.activeBuffer; //switch buffer
 		channel.doneOnTime=false;
-		BeagleRT_scheduleAuxiliaryTask(NetworkSend::transmitAudioTask); //send the buffer
+		BeagleRT_scheduleAuxiliaryTask(NetworkSend::sendDataTask); //send the buffer
 		//TODO: maybe we should have transmitAudioTask running in a loop instead of scheduling it multiple times?
 	}
 	if(channel.index==channel.headerLength){
 		channel.buffers[channel.activeBuffer][0] = (float)channel.channelNumber; //TODO: this could actually be done just once in setup()
 		channel.buffers[channel.activeBuffer][1]=(float)sampleCount; //timestamp