Merge branch 'feature/consistency' into develop

This commit is contained in:
Jason Watkins
2015-04-21 15:58:44 -07:00
51 changed files with 1812 additions and 2172 deletions

View File

@@ -70,11 +70,9 @@
#endif
#define RECVPORT 49009 // Port that the plugin receives commands on
#define SENDPORT 49097 // Port that the plugin sends on
#define OPS_PER_CYCLE 20 // Max Number of operations per cycle
XPC::UDPSocket* recvSocket = nullptr;
XPC::UDPSocket* sendSocket = nullptr;
XPC::UDPSocket* sock = nullptr;
double start,lap;
static double timeConvert = 0.0;
@@ -125,10 +123,8 @@ PLUGIN_API void XPluginStop(void)
PLUGIN_API void XPluginDisable(void)
{
// Close sockets
delete recvSocket;
delete sendSocket;
recvSocket = nullptr;
sendSocket = nullptr;
delete sock;
sock = nullptr;
// Stop rendering messages to screen.
XPC::Drawing::ClearMessage();
@@ -142,9 +138,8 @@ PLUGIN_API void XPluginDisable(void)
PLUGIN_API int XPluginEnable(void)
{
// Open sockets
recvSocket = new XPC::UDPSocket(RECVPORT);
sendSocket = new XPC::UDPSocket(SENDPORT);
XPC::MessageHandlers::SetSocket(sendSocket);
sock = new XPC::UDPSocket(RECVPORT);
XPC::MessageHandlers::SetSocket(sock);
XPC::Log::WriteLine("[EXEC] Plugin Enabled, sockets opened");
if (benchmarkingSwitch > 0)
@@ -188,7 +183,7 @@ float XPCFlightLoopCallback(float inElapsedSinceLastCall,
#endif
}
XPC::Message msg = XPC::Message::ReadFrom(*recvSocket);
XPC::Message msg = XPC::Message::ReadFrom(*sock);
if (msg.GetHead() == "")
{
break;
@@ -208,8 +203,8 @@ float XPCFlightLoopCallback(float inElapsedSinceLastCall,
if (cyclesToClear != -1 && counter%cyclesToClear == 0)
{
XPC::Log::WriteLine("[EXEC] Cleared UDP Buffer");
delete recvSocket;
recvSocket = new XPC::UDPSocket(RECVPORT);
delete sock;
sock = new XPC::UDPSocket(RECVPORT);
}
return -1;
}