two addresses (my private one and the sf address). when the sf
like the one below. would it be possible to either allow postings
> From:
sc-dev-owner@...
> Date: 25. Juni 2008 12:17:20 GMT+02:00
> To: kersten
> Subject: SF.net SVN: supercollider: [7638] trunk
>
> You are not allowed to post to this mailing list, and your message has
> been automatically rejected. If you think that your messages are
> being rejected in error, contact the mailing list owner at
>
sc-dev-owner@....
>
>
> From: kersten
> Date: 25. Juni 2008 12:17:12 GMT+02:00
> To:
sc-dev@...
> Subject: SF.net SVN: supercollider: [7638] trunk
>
>
> Revision: 7638
>
http://svn.sourceforge.net/supercollider/?rev=7638&view=rev> Author: kersten
> Date: 2008-06-25 03:17:12 -0700 (Wed, 25 Jun 2008)
>
> Log Message:
> -----------
> * Add mReplyData field to ReplyAddr struct and add
> World_SendPacketWithContext
> * Remove ulong typedef from SC_Types.h
> * Add World_SendPacketWithContext and oscTimeNow to libscsynth_exp
> library exports
> * Declare oscTimeNow as extern "C"
>
> Modified Paths:
> --------------
> trunk/Headers/common/SC_Reply.h
> trunk/Headers/plugin_interface/SC_Types.h
> trunk/Headers/plugin_interface/SC_WorldOptions.h
> trunk/Headers/server/SC_CoreAudio.h
> trunk/Source/lang/LangSource/PyrMathOps.cpp
> trunk/Source/server/SC_ComPort.cpp
> trunk/libscsynth_exp
>
> Modified: trunk/Headers/common/SC_Reply.h
> ===================================================================
> --- trunk/Headers/common/SC_Reply.h 2008-06-24 16:48:54 UTC (rev 7637)
> +++ trunk/Headers/common/SC_Reply.h 2008-06-25 10:17:12 UTC (rev 7638)
> @@ -40,7 +40,8 @@
> struct sockaddr_in mSockAddr;
> int mSockAddrLen;
> int mSocket;
> - ReplyFunc mReplyFunc;
> + ReplyFunc mReplyFunc;
> + void *mReplyData;
> };
>
> bool operator==(const ReplyAddress& a, const ReplyAddress& b);
>
> Modified: trunk/Headers/plugin_interface/SC_Types.h
> ===================================================================
> --- trunk/Headers/plugin_interface/SC_Types.h 2008-06-24 16:48:54
> UTC (rev 7637)
> +++ trunk/Headers/plugin_interface/SC_Types.h 2008-06-25 10:17:12
> UTC (rev 7638)
> @@ -35,9 +35,6 @@
>
> typedef int int32;
> typedef unsigned int uint32;
> -#ifdef SC_DARWIN
> -typedef unsigned int ulong;
> -#endif
>
> typedef short int16;
> typedef unsigned short uint16;
>
> Modified: trunk/Headers/plugin_interface/SC_WorldOptions.h
> ===================================================================
> --- trunk/Headers/plugin_interface/SC_WorldOptions.h 2008-06-24
> 16:48:54 UTC (rev 7637)
> +++ trunk/Headers/plugin_interface/SC_WorldOptions.h 2008-06-25
> 10:17:12 UTC (rev 7638)
> @@ -118,6 +118,7 @@
> #endif
> SC_DLLEXPORT void World_WaitForQuit(struct World *inWorld);
> SC_DLLEXPORT bool World_SendPacket(struct World *inWorld, int
> inSize, char *inData, ReplyFunc inFunc);
> + SC_DLLEXPORT bool World_SendPacketWithContext(struct World
> *inWorld, int inSize, char *inData, ReplyFunc inFunc, void
> *inContext);
> SC_DLLEXPORT int World_CopySndBuf(World *world, uint32 index,
> struct SndBuf *outBuf, bool onlyIfChanged, bool &didChange);
> SC_DLLEXPORT int scprintf(const char *fmt, ...);
> }
>
> Modified: trunk/Headers/server/SC_CoreAudio.h
> ===================================================================
> --- trunk/Headers/server/SC_CoreAudio.h 2008-06-24 16:48:54 UTC
> (rev 7637)
> +++ trunk/Headers/server/SC_CoreAudio.h 2008-06-25 10:17:12 UTC
> (rev 7638)
> @@ -80,8 +80,8 @@
> // Functions to be implemented by the driver backend
> extern "C" {
> int32 server_timeseed();
> + int64 oscTimeNow();
> };
> -int64 oscTimeNow();
> void initializeScheduler();
>
> class SC_AudioDriver
>
> Modified: trunk/Source/lang/LangSource/PyrMathOps.cpp
> ===================================================================
> --- trunk/Source/lang/LangSource/PyrMathOps.cpp 2008-06-24 16:48:54
> UTC (rev 7637)
> +++ trunk/Source/lang/LangSource/PyrMathOps.cpp 2008-06-25 10:17:12
> UTC (rev 7638)
> @@ -359,13 +359,7 @@
> res.utag = tagInt;
> } break;
> case opUnsignedShift : {
> -#ifdef SC_WIN32
> unsigned long ia = a->ui;
> -#elif defined(SC_FREEBSD)
> - u_long ia = a->ui;
> -#else
> - ulong ia = a->ui;
> -#endif
> long ib = b->ui;
> if (ib>0) ia >>= ib;
> else if (ib<0) ia <<= -ib;
>
> Modified: trunk/Source/server/SC_ComPort.cpp
> ===================================================================
> --- trunk/Source/server/SC_ComPort.cpp 2008-06-24 16:48:54 UTC (rev
> 7637)
> +++ trunk/Source/server/SC_ComPort.cpp 2008-06-25 10:17:12 UTC (rev
> 7638)
> @@ -178,7 +178,7 @@
> if (mode & 2) hexdump(size, inData);
> }
>
> -bool World_SendPacket(World *inWorld, int inSize, char *inData,
> ReplyFunc inFunc)
> +bool World_SendPacketWithContext(World *inWorld, int inSize, char
> *inData, ReplyFunc inFunc, void *inContext)
> {
> bool result = false;
> if (inSize > 0) {
> @@ -189,6 +189,7 @@
> packet->mReplyAddr.mSockAddr.sin_addr.s_addr = 0;
> packet->mReplyAddr.mSockAddr.sin_port = 0;
> packet->mReplyAddr.mReplyFunc = inFunc;
> + packet->mReplyAddr.mReplyData = inContext;
> packet->mSize = inSize;
> packet->mData = data;
> packet->mReplyAddr.mSocket = 0;
> @@ -199,6 +200,11 @@
> return result;
> }
>
> +bool World_SendPacket(World *inWorld, int inSize, char *inData,
> ReplyFunc inFunc)
> +{
> + return World_SendPacketWithContext(inWorld, inSize, inData,
> inFunc, 0);
> +}
> +
> /////////////////////////////////////////////////////////////////////
> /////////////////////////////////////
>
> SC_CmdPort::SC_CmdPort(struct World *inWorld) : mWorld(inWorld)
> @@ -408,6 +414,7 @@
> if (mWorld->mDumpOSC) dumpOSC(mWorld->mDumpOSC, size, data);
>
> packet->mReplyAddr.mReplyFunc = udp_reply_func;
> + packet->mReplyAddr.mReplyData = 0;
> packet->mSize = size;
> packet->mData = data;
> packet->mReplyAddr.mSocket = mSocket;
> @@ -588,6 +595,7 @@
> if (mWorld->mDumpOSC) dumpOSC(mWorld->mDumpOSC, size, data);
>
> packet->mReplyAddr.mReplyFunc = tcp_reply_func;
> + packet->mReplyAddr.mReplyData = 0;
> packet->mSize = msglen;
> packet->mData = data;
> packet->mReplyAddr.mSocket = mSocket;
> @@ -716,6 +724,7 @@
> OSC_Packet* packet = (OSC_Packet *) malloc(sizeof(OSC_Packet));
> bzero(&packet->mReplyAddr, sizeof(ReplyAddress));
> packet->mReplyAddr.mReplyFunc = port->mReplyPort ?
> mach_reply_func : null_reply_func;
> + packet->mReplyAddr.mReplyData = 0;
> packet->mReplyAddr.mSocket = (int) port->mReplyPort;
> packet->mSize = CFDataGetLength(data);
> packet->mData = (char*) memcpy(malloc(packet->mSize),
> CFDataGetBytePtr(data), packet->mSize);
>
> Modified: trunk/libscsynth_exp
> ===================================================================
> --- trunk/libscsynth_exp 2008-06-24 16:48:54 UTC (rev 7637)
> +++ trunk/libscsynth_exp 2008-06-25 10:17:12 UTC (rev 7638)
> @@ -5,7 +5,9 @@
> _World_OpenTCP
> _World_OpenMachPorts
> _World_SendPacket
> +_World_SendPacketWithContext
> _World_WaitForQuit
> _World_CopySndBuf
> _SetPrintFunc
> -_scprintf
> \ No newline at end of file
> +_scprintf
> +_oscTimeNow
> \ No newline at end of file
>
>
> This was sent by the SourceForge.net collaborative development
> platform, the world's largest Open Source development site.
>
>