server: added back dumpOSC

thanks to Open Music Kontrollers for spotting what was missing.
supercollider · Nov 25, 2013 · ee78d38 · ee78d38
1 parent eab3bfa
commit ee78d38
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/common/SC_OscUtils.hpp b/common/SC_OscUtils.hpp
@@ -161,7 +161,7 @@ static bool dumpOSCbndl(int indent, int size, char *inData)
 		if (!strcmp(data, "#bundle"))
 			contentPrinted = dumpOSCbndl(indent+1, msgSize, data);
 		else
-			contentPrinted = dumpOSCmsg(msgSize, data);
+			contentPrinted = dumpOSCmsg(msgSize, data, true);
 		data += msgSize;
 		if ( (data < dataEnd) && contentPrinted) scprintf(",");
 	}
@@ -182,7 +182,7 @@ static void dumpOSC(int mode, int size, char* inData)
 		if (strcmp(inData, "#bundle") == 0)
 			contentPrinted = dumpOSCbndl(indent, size, inData);
 		else
-			contentPrinted = dumpOSCmsg(size, inData);
+			contentPrinted = dumpOSCmsg(size, inData, true);
 
 		if (contentPrinted)
 			scprintf("\n");

diff --git a/server/scsynth/SC_ComPort.cpp b/server/scsynth/SC_ComPort.cpp
@@ -219,6 +219,8 @@ class SC_UdpInPort
 			return;
 		}
 
+		if (mWorld->mDumpOSC) dumpOSC(mWorld->mDumpOSC, bytes_transferred, recvBuffer.data());
+
 		OSC_Packet * packet = (OSC_Packet*)malloc(sizeof(OSC_Packet));
 
 		packet->mReplyAddr.mProtocol = kUDP;
@@ -368,6 +370,8 @@ class SC_TcpConnection:
 
 		assert(bytes_transferred == OSCMsgLength);
 
+		if (mWorld->mDumpOSC) dumpOSC(mWorld->mDumpOSC, bytes_transferred, data);
+
 		OSC_Packet * packet = (OSC_Packet*)malloc(sizeof(OSC_Packet));
 
 		packet->mReplyAddr.mProtocol = kTCP;