kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename to WebSocketMessageQueue

Browse Source
This commit is contained in:
dimon4eg 2019-05-09 00:09:51 +03:00
parent 7fb1b65ddd
commit d6e9b61c8e
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -28,7 +28,7 @@ set( IXWEBSOCKET_SOURCES
ixwebsocket/IXCancellationRequest.cpp ixwebsocket/IXCancellationRequest.cpp
ixwebsocket/IXNetSystem.cpp ixwebsocket/IXNetSystem.cpp
ixwebsocket/IXWebSocket.cpp ixwebsocket/IXWebSocket.cpp
ixwebsocket/IXWebSocketPoll.cpp ixwebsocket/IXWebSocketMessageQueue.cpp
ixwebsocket/IXWebSocketServer.cpp ixwebsocket/IXWebSocketServer.cpp
ixwebsocket/IXWebSocketTransport.cpp ixwebsocket/IXWebSocketTransport.cpp
ixwebsocket/IXWebSocketHandshake.cpp ixwebsocket/IXWebSocketHandshake.cpp
@ -55,7 +55,7 @@ set( IXWEBSOCKET_HEADERS
ixwebsocket/IXNetSystem.h ixwebsocket/IXNetSystem.h
ixwebsocket/IXProgressCallback.h ixwebsocket/IXProgressCallback.h
ixwebsocket/IXWebSocket.h ixwebsocket/IXWebSocket.h
ixwebsocket/IXWebSocketPoll.h ixwebsocket/IXWebSocketMessageQueue.h
ixwebsocket/IXWebSocketServer.h ixwebsocket/IXWebSocketServer.h
ixwebsocket/IXWebSocketTransport.h ixwebsocket/IXWebSocketTransport.h
ixwebsocket/IXWebSocketHandshake.h ixwebsocket/IXWebSocketHandshake.h

14
ixwebsocket/IXWebSocketPoll.cpp → ixwebsocket/IXWebSocketMessageQueue.cpp
View File

@ -4,17 +4,17 @@
* Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved. * Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
*/ */
#include "IXWebSocketPoll.h" #include "IXWebSocketMessageQueue.h"
namespace ix namespace ix
{ {
WebSocketPoll::WebSocketPoll(WebSocket* websocket) WebSocketMessageQueue::WebSocketMessageQueue(WebSocket* websocket)
{ {
bindWebsocket(websocket); bindWebsocket(websocket);
} }
WebSocketPoll::~WebSocketPoll() WebSocketMessageQueue::~WebSocketMessageQueue()
{ {
if (!_messages.empty()) if (!_messages.empty())
{ {
@ -24,7 +24,7 @@ namespace ix
bindWebsocket(nullptr); bindWebsocket(nullptr);
} }
void WebSocketPoll::bindWebsocket(WebSocket * websocket) void WebSocketMessageQueue::bindWebsocket(WebSocket * websocket)
{ {
if (_websocket != websocket) if (_websocket != websocket)
{ {
@ -64,12 +64,12 @@ namespace ix
} }
} }
void WebSocketPoll::setOnMessageCallback(const OnMessageCallback& callback) void WebSocketMessageQueue::setOnMessageCallback(const OnMessageCallback& callback)
{ {
_onMessageUserCallback = callback; _onMessageUserCallback = callback;
} }
WebSocketPoll::MessageDataPtr WebSocketPoll::popMessage() WebSocketMessageQueue::MessageDataPtr WebSocketMessageQueue::popMessage()
{ {
MessageDataPtr message; MessageDataPtr message;
@ -84,7 +84,7 @@ namespace ix
return message; return message;
} }
void WebSocketPoll::poll(int count) void WebSocketMessageQueue::poll(int count)
{ {
if (!_onMessageUserCallback) if (!_onMessageUserCallback)
return; return;

6
ixwebsocket/IXWebSocketPoll.h → ixwebsocket/IXWebSocketMessageQueue.h
View File

@ -16,11 +16,11 @@ namespace ix
/** /**
* A helper class to dispatch websocket message callbacks in your thread. * A helper class to dispatch websocket message callbacks in your thread.
*/ */
class WebSocketPoll class WebSocketMessageQueue
{ {
public: public:
WebSocketPoll(WebSocket* websocket = nullptr); WebSocketMessageQueue(WebSocket* websocket = nullptr);
~WebSocketPoll(); ~WebSocketMessageQueue();
void bindWebsocket(WebSocket* websocket); void bindWebsocket(WebSocket* websocket);