diff -r 90f927b4b9e1 -r 0c6fb706f747 hedgewars/uFLIPC.pas --- a/hedgewars/uFLIPC.pas Fri Dec 22 23:59:03 2017 +0100 +++ b/hedgewars/uFLIPC.pas Sun Dec 24 00:44:16 2017 +0100 @@ -12,26 +12,19 @@ //function ipcReadFromEngine: shortstring; //function ipcCheckFromEngine: boolean; -procedure ipcToNet(s: shortstring); -procedure ipcToNetRaw(p: pointer; len: Longword); - procedure ipcToFrontend(s: shortstring); procedure ipcToFrontendRaw(p: pointer; len: Longword); function ipcReadFromFrontend: TIPCMessage; function ipcCheckFromFrontend: boolean; procedure registerIPCCallback(p: pointer; f: TIPCCallback); -procedure registerNetCallback(p: pointer; f: TIPCCallback); implementation var callbackPointerF: pointer; callbackFunctionF: TIPCCallback; callbackListenerThreadF: PSDL_Thread; - callbackPointerN: pointer; - callbackFunctionN: TIPCCallback; - callbackListenerThreadN: PSDL_Thread; - queueFrontend, queueEngine, queueNet: PIPCQueue; + queueFrontend, queueEngine: PIPCQueue; procedure ipcSend(var s: TIPCMessage; queue: PIPCQueue); var pmsg: PIPCMessage; @@ -174,14 +167,6 @@ SDL_UnlockMutex(q^.mut); end; -procedure ipcToNet(s: shortstring); -var msg: TIPCMessage; -begin - msg.str:= s; - msg.buf:= nil; - ipcSend(msg, queueNet) -end; - procedure ipcToEngineRaw(p: pointer; len: Longword); var msg: TIPCMessage; begin @@ -202,16 +187,6 @@ ipcSend(msg, queueFrontend) end; -procedure ipcToNetRaw(p: pointer; len: Longword); -var msg: TIPCMessage; -begin - msg.str[0]:= #0; - msg.len:= len; - msg.buf:= GetMem(len); - Move(p^, msg.buf^, len); - ipcSend(msg, queueNet) -end; - function ipcReadFromEngine: TIPCMessage; begin ipcReadFromEngine:= ipcRead(queueFrontend) @@ -222,11 +197,6 @@ ipcReadFromFrontend:= ipcRead(queueEngine) end; -function ipcReadToNet: TIPCMessage; -begin - ipcReadToNet:= ipcRead(queueNet) -end; - function ipcCheckFromEngine: boolean; begin ipcCheckFromEngine:= ipcCheck(queueFrontend) @@ -253,22 +223,6 @@ until false end; -function netListener(p: pointer): Longint; cdecl; export; -var msg: TIPCMessage; -begin - netListener:= 0; - repeat - msg:= ipcReadToNet(); - if msg.buf = nil then - callbackFunctionN(callbackPointerN, @msg.str[1], byte(msg.str[0])) - else - begin - callbackFunctionN(callbackPointerN, msg.buf, msg.len); - FreeMem(msg.buf, msg.len) - end - until false -end; - procedure registerIPCCallback(p: pointer; f: TIPCCallback); begin callbackPointerF:= p; @@ -276,13 +230,6 @@ callbackListenerThreadF:= SDL_CreateThread(@engineListener, 'engineListener', nil); end; -procedure registerNetCallback(p: pointer; f: TIPCCallback); -begin - callbackPointerN:= p; - callbackFunctionN:= f; - callbackListenerThreadN:= SDL_CreateThread(@netListener, 'netListener', nil); -end; - function createQueue: PIPCQueue; var q: PIPCQueue; begin @@ -308,7 +255,6 @@ begin queueFrontend:= createQueue; queueEngine:= createQueue; - queueNet:= createQueue; callbackPointerF:= nil; callbackListenerThreadF:= nil; @@ -317,10 +263,8 @@ procedure freeIPC; begin //FIXME SDL_KillThread(callbackListenerThreadF); - //FIXME SDL_KillThread(callbackListenerThreadN); destroyQueue(queueFrontend); destroyQueue(queueEngine); - destroyQueue(queueNet); end; end.