Diff: OSCMessage.cpp

Revision:

17:9479c15a9d54

Parent:

16:36d28d8e5491

Parent:

15:feef2588372f

Child:

18:3c678e1d5a84

--- a/OSCMessage.cpp	Fri Dec 14 19:36:56 2018 +0100
+++ b/OSCMessage.cpp	Fri Dec 14 19:47:55 2018 +0100
@@ -198,11 +198,7 @@
     if (!hasError()){
         return datum->getBlob(buffer);
   } else {
-    #ifndef ESPxx
-        return NULL;
-    #else
         return -1;
-    #endif
   }
 }
 
@@ -211,11 +207,7 @@
     if (!hasError()){
         return datum->getBlob(buffer, bufferSize);
   } else {
-    #ifndef ESPxx
-        return NULL;
-    #else
         return -1;
-    #endif
   }
 }
 
@@ -224,11 +216,7 @@
     if (!hasError()){
         return datum->getBlob(buffer, bufferSize, offset, size);
   } else {
-    #ifndef ESPxx
-        return NULL;
-    #else
         return -1;
-    #endif
   }
 }
 
@@ -238,11 +226,7 @@
   if (!hasError()){
     return datum->getBlobLength();
   } else {
-    #ifndef ESPxx
-        return NULL;
-    #else
         return -1;
-    #endif
   }
 
 }
@@ -252,11 +236,7 @@
 	if (!hasError()){
 		return datum->type;
 	} else {
-        #ifndef ESPxx
-            return (int)NULL;
-        #else
             return '\0';
-        #endif
     }
 }
 
@@ -533,7 +513,7 @@
             	buff[lengthEnd++]=ptr[i];
             }
 
-        } /*  else if (datum->type == 't'){
+        } /*  else if (datum->type == 't'){ TODO: implement time sending
             osctime_t time =  datum->data.time;
             uint32_t d = BigEndian(time.seconds);
             uint8_t * ptr = (uint8_t *)    &d;
@@ -548,9 +528,8 @@
             uint32_t i = BigEndian(datum->data.i);
             uint8_t * ptr = (uint8_t *) &i;
             for (int i = 0; i < datum->bytes; i++){
-                	buff[lengthEnd++]=ptr[i];
-                //    p.write((uint8_t) getType(i));
-                }
+            	buff[lengthEnd++]=ptr[i];
+            }
       //      p.write(ptr, datum->bytes);
         }
     }