comparison include/Scope.h @ 93:8c7f537d0a21

edited Scope.h with ifdefs to be compatible with udpio plugin

 #include <BeagleRT.h> 
 #include <rtdk.h>
 #include <cmath>
 #include <UdpClient.h>
 
-#define NETWORK_AUDIO_BUFFER_SIZE 2048 
+#define NETWORK_AUDIO_BUFFER_SIZE 400
 struct networkAudio{
 	int timestamp;
 	int currentBuffer;
 	int index;
 	float buffers[2][NETWORK_AUDIO_BUFFER_SIZE]; 

         numChannels = NUM_SCOPE_CHANNELS;
         sampleCount = 0;
         
         for(int n=0; n<numChannels; n++){
             channel[n].doneOnTime=1;
-            channel[n].index=2;
+            channel[n].index=2; //leave space for the heading message (channel, timestamp)
             channel[n].timestamp=0;
             channel[n].currentBuffer=0;
             channel[n].toBeSent=false;
+#ifdef BUILD_FOR_UDPRECEIVE_PLUGIN
+            channel[n].udpClient.setPort(9999+n);
+            channel[n].udpClient.setServer("192.168.7.1");
+#else
             channel[n].udpClient.setPort(9999);
             channel[n].udpClient.setServer("127.0.0.1");
+#endif /* BUILD_FOR_UDPRECEIVE_PLUGIN */
     	}
     }
     void setup(float _sampleRate);
     void log(float channel1=0.0, float channel2=0.0, float channel3=0.0, float channel4=0.0, float channel5=0.0, float channel6=0.0){
         

 
 static void SendScopeData(){
     for(int n=0; n<gOscilloscopeInstance->numChannels; n++){
 		if(gOscilloscopeInstance->channel[n].toBeSent){
 			gOscilloscopeInstance->channel[n].toBeSent=false;
-			gOscilloscopeInstance->channel[n].udpClient.send(gOscilloscopeInstance->channel[n].buffers[!gOscilloscopeInstance->channel[n].currentBuffer],NETWORK_AUDIO_BUFFER_SIZE*sizeof(float));
+			gOscilloscopeInstance->channel[n].udpClient.send(
+				gOscilloscopeInstance->channel[n].buffers[!gOscilloscopeInstance->channel[n].currentBuffer],
+				NETWORK_AUDIO_BUFFER_SIZE*sizeof(float)
+			);
 			gOscilloscopeInstance->channel[n].doneOnTime=1;
 		}
 	}
 }