Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/etri-smartspaces

bbiwarg/TUIO/TUIO/TuioServer.cs

@@ -147,12 +147,15 @@ namespace TUIO
                 }*/
                 packet.Append(currentMessage);
             }
-            currentMessage = new OSCMessage("/tuio/2Dcur");
+            currentMessage = new OSCMessage("/tuio/2Dobj");
             currentMessage.Append("fseq");
-            currentMessage.Append(-1);
+            currentMessage.Append(-1); //sequence_id; actually -1 stands for redundant bundle
             packet.Append(currentMessage);
+            transmitter.Send(packet);
 
             // objects
+            packet = new OSCBundle();
+
             addAliveObjectMessagesToBundle(packet);
             TuioObject tobj;
             for (int i = 0; i < objectList.Count; i++)
@@ -171,18 +174,11 @@ namespace TUIO
                 currentMessage.Append(tobj.getMotionAccel());
                 currentMessage.Append(tobj.getRotationAccel());
 
-                /*if (Marshal.SizeOf(packet) + Marshal.SizeOf(currentOscElement) >= MAX_PACKET_SIZE)
-                {
-                    packet.AddElement(new OscElement("/tuio/2Dobj", new Object[] { "fseq", -1 }));
-                    udpwriter.Send(packet);
-
-                    packet = new OscBundle();
-                    addAliveObjectMessagesToBundle(packet);
-                }*/
+                packet.Append(currentMessage);
             }
             currentMessage = new OSCMessage("/tuio/2Dobj");
             currentMessage.Append("fseq");
-            currentMessage.Append(-1);
+            currentMessage.Append(-1); //sequence_id; actually -1 stands for redundant bundle
             packet.Append(currentMessage);
 
 
@@ -202,7 +198,7 @@ namespace TUIO
 
         private void addAliveObjectMessagesToBundle(OSCBundle packet)
         {
-            OSCMessage mssg = new OSCMessage("/tuio/2Dcobj");
+            OSCMessage mssg = new OSCMessage("/tuio/2Dobj");
             mssg.Append("alive");
             for (int i = 0; i < objectList.Count; i++)
             {