Fix issue with TDM creation from GUI++

Fixes github issue #8. Also tidy up some potential warnings, and listObjects() in the demo
h4yn0nnym0u5e · Jan 30, 2022 · 02a19d8 · 02a19d8
1 parent 442625a
commit 02a19d8
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 12 deletions.
diff --git a/OSCAudioBase.cpp b/OSCAudioBase.cpp
@@ -666,7 +666,7 @@ void OSCAudioBase::createObject(OSCMessage& msg, int addressOffset, OSCBundle& r
 	int objIdx;
 	int mixerSize = -1;
 	int ml = msg.size() - 1;
-	bool isRoot = ml<2;
+	bool isRoot = !(ml>1 && msg.isString(2)); // sss or sssi, but not ssi, are group creates
 
 	typ = getMessageString(msg,0,alloca(msg.getDataLength(0)));
 	objName = getMessageString(msg,1,alloca(msg.getDataLength(1)+1),true);
@@ -680,13 +680,11 @@ void OSCAudioBase::createObject(OSCMessage& msg, int addressOffset, OSCBundle& r
 			{
 				mixerSize = msg.getInt(ml); // get mixer width
 				objIdx = AUDIOMIXER_INDEX;
-				isRoot = ml<3;
 			}
 			else if (msg.isInt(ml) && 0 == strcmp(AudioMixerStereoName,typ)) // last parameter is an integer? variable width mixer?
 			{
 				mixerSize = msg.getInt(ml); // get mixer width
 				objIdx = AUDIOMIXERSTEREO_INDEX;
-				isRoot = ml<3;
 			}
 		}
 

diff --git a/OSCAudioBase.h b/OSCAudioBase.h
@@ -43,7 +43,14 @@
 
 
 #define noOSC_DEBUG_PRINT
+#if !defined(DEBUG_SER)
 #if defined(OSC_DEBUG_PRINT)
+// might have previous "no debug" definition
+#undef OSC_SPRT
+#undef OSC_SPLN
+#undef OSC_SPTF
+#undef OSC_SFSH
+#undef OSC_DBGP
 #define DEBUG_SER Serial
 #define OSC_SPRT(...) DEBUG_SER.print(__VA_ARGS__)
 #define OSC_SPLN(...) DEBUG_SER.println(__VA_ARGS__)
@@ -57,6 +64,7 @@
 #define OSC_SFSH(...)
 #define OSC_DBGP(...)
 #endif // defined(OSC_DEBUG_PRINT)
+#endif // !defined(DEBUG_SER)
 
 extern void listObjects(void);
 

diff --git a/OSCUtils.h b/OSCUtils.h
@@ -38,7 +38,14 @@
 
 
 #define noOSC_DEBUG_PRINT
-#if defined(OSC_DEBUG_PRINT) && !defined(DEBUG_SER)
+#if !defined(DEBUG_SER)
+#if defined(OSC_DEBUG_PRINT)
+// might have previous "no debug" definition
+#undef OSC_SPRT
+#undef OSC_SPLN
+#undef OSC_SPTF
+#undef OSC_SFSH
+#undef OSC_DBGP
 #define DEBUG_SER Serial
 #define OSC_SPRT(...) DEBUG_SER.print(__VA_ARGS__)
 #define OSC_SPLN(...) DEBUG_SER.println(__VA_ARGS__)
@@ -52,6 +59,7 @@
 #define OSC_SFSH(...)
 #define OSC_DBGP(...)
 #endif // defined(OSC_DEBUG_PRINT)
+#endif // !defined(DEBUG_SER)
 
 
 class OSCUtils

diff --git a/examples/OSCAudioMIDIsubsFS/OSCAudioMIDIsubsFS.ino b/examples/OSCAudioMIDIsubsFS/OSCAudioMIDIsubsFS.ino
@@ -47,6 +47,9 @@
 //#include "dynamic-util.h"
 #include "OSCAudioBase.h"
 
+#define LIST_OBJECTS true
+void listObjects(void) {listObjects(LIST_OBJECTS);}
+
 #define noOSC_USE_USB_SERIAL
 #if defined(OSC_USE_USB_SERIAL)
 // set this to the USB serial port you wish to use
@@ -88,7 +91,7 @@ void setup() {
   AudioMemory(50); // no idea what we'll need, so allow plenty
   //-------------------------------
   //testSanitise();
-  listObjects();
+  listObjects(LIST_OBJECTS);
   //listAllTypes();
 }
 
@@ -278,15 +281,15 @@ void updateOSC()
       {
         processBundle(bndl,reply);
         sendReply(reply);
-        listObjects();
+        listObjects(LIST_OBJECTS);
       }
       else 
       {
         if ('/' == firstCh) 
         {
           processMessage(&msg,reply);   
           sendReply(reply);
-          listObjects();
+          listObjects(LIST_OBJECTS);
         }
       }
       Serial.println();

diff --git a/examples/OSCAudioMIDIsubsFS/utils.ino b/examples/OSCAudioMIDIsubsFS/utils.ino
@@ -74,17 +74,19 @@ void listObjects(OSCAudioBase* obj,int indent=0)
   depth--;
   if (0 == depth && !locked)
     count = 0;
-  Serial.printf("Count: %d\n",count);
+  //Serial.printf("Count: %d\n",count);
 }
 
 
-void listObjectsx(void)
+void listObjects(bool doit)
 {
-  listObjects(OSCAudioBase::getFirst());
-  Serial.println("--------------\n");
+  if (doit)
+  {
+    listObjects(OSCAudioBase::getFirst());
+    Serial.println("--------------\n");
+  }
 }
 
-void listObjects(void){}
 
 //=============================================================
 void goFind(OSCMessage& msg,int o,int md,OSCAudioBase* ooi)