Diff: mbedOSC.h

Revision:

11:853a9e887023

Parent:

10:b4cc0df203b7

--- a/mbedOSC.h	Sun Apr 15 13:26:47 2012 +0000
+++ b/mbedOSC.h	Sun Apr 15 15:05:19 2012 +0000
@@ -1,15 +1,13 @@
 /* mbed OSC Library
  This is an Open Sound Control library for the mbed, created to be compatible with Recotana's OSCClass library (http://recotana.com) for the
- Arduino with Ethernet shield. I have also used parts of the OSC Transceiver(Sender/Receiver) code by xshige
- written by: Alvaro Cassinelli, 7.10.2011
- tweaked by: Toby Harris / *spark audio-visual, 13.4.2012
+ Arduino with Ethernet shield. It also uses parts of the OSC Transceiver(Sender/Receiver) code by xshige
+ written by: Alvaro Cassinelli, October 2011
+ tweaked by: Toby Harris / *spark audio-visual, March 2012
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License version 2.1 as published by the Free Software Foundation.
  Open Sound Control  http://opensoundcontrol.org/
- 
- 
 */
 
 #ifndef mbedOSC_h
@@ -245,10 +243,14 @@
     char         tempAddress[MAX_ADDRESS][16];
     uint8_t      tempArg[MAX_ARG][4];    
     
+    void onUDPSocketEvent(UDPSocketEvent e);
+    
     void decodePacket( OSCMessage *_mes); // makes OSC message from packet
 
 public:
     
+    friend class UDPSocket;
+    
     /** Create an object to send and receive OSC messages */
     OSCClass();
     
@@ -257,11 +259,6 @@
  @param[in] _mes A pointer to the "receiveing" OSC message (OSCMessage *)
  */
     OSCClass(OSCMessage *_mes); // set the receiver message container
-
-/**
- Ignore: See messageReceivedCallback instead. This is called by the UDPSocket... and should be a protected function and we friend UDPSocket?
- */
-    void onUDPSocketEvent(UDPSocketEvent e);
         
 /**
  This initializes the OSC communication object with default receiving port (DEFAULT_REC_PORT) 
@@ -280,7 +277,7 @@
     void stop();
     
 /**
- Returns whether there is new OSC data in the receiver message container
+ Returns whether there is new OSC data in the receiver message container.
  */
     bool newMessage;