ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NetPlayServer: Make SendAsyncToClients use an unique_ptr

This commit is contained in:
mathieui 2016-01-26 21:37:42 +01:00
parent 34ae512d91
commit 8ce9191948
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/Core/NetPlayServer.cpp
View File

@ -450,18 +450,18 @@ void NetPlayServer::AdjustPadBufferSize(unsigned int size)
m_target_buffer_size = size; m_target_buffer_size = size;
// tell clients to change buffer size // tell clients to change buffer size
sf::Packet* spac = new sf::Packet; auto spac = std::make_unique<sf::Packet>();
*spac << (MessageId)NP_MSG_PAD_BUFFER; *spac << static_cast<MessageId>(NP_MSG_PAD_BUFFER);
*spac << (u32)m_target_buffer_size; *spac << static_cast<u32>(m_target_buffer_size);
SendAsyncToClients(spac); SendAsyncToClients(std::move(spac));
} }
void NetPlayServer::SendAsyncToClients(sf::Packet* packet) void NetPlayServer::SendAsyncToClients(std::unique_ptr<sf::Packet> packet)
{ {
{ {
std::lock_guard<std::recursive_mutex> lkq(m_crit.async_queue_write); std::lock_guard<std::recursive_mutex> lkq(m_crit.async_queue_write);
m_async_queue.Push(std::unique_ptr<sf::Packet>(packet)); m_async_queue.Push(std::move(packet));
} }
ENetUtil::WakeupThread(m_server); ENetUtil::WakeupThread(m_server);
} }
@ -674,12 +674,12 @@ void NetPlayServer::OnTraversalStateChanged()
// called from ---GUI--- thread // called from ---GUI--- thread
void NetPlayServer::SendChatMessage(const std::string& msg) void NetPlayServer::SendChatMessage(const std::string& msg)
{ {
sf::Packet* spac = new sf::Packet; auto spac = std::make_unique<sf::Packet>();
*spac << (MessageId)NP_MSG_CHAT_MESSAGE; *spac << (MessageId)NP_MSG_CHAT_MESSAGE;
*spac << (PlayerId)0; // server id always 0 *spac << (PlayerId)0; // server id always 0
*spac << msg; *spac << msg;
SendAsyncToClients(spac); SendAsyncToClients(std::move(spac));
} }
// called from ---GUI--- thread // called from ---GUI--- thread
@ -690,11 +690,11 @@ bool NetPlayServer::ChangeGame(const std::string &game)
m_selected_game = game; m_selected_game = game;
// send changed game to clients // send changed game to clients
sf::Packet* spac = new sf::Packet; auto spac = std::make_unique<sf::Packet>();
*spac << (MessageId)NP_MSG_CHANGE_GAME; *spac << (MessageId)NP_MSG_CHANGE_GAME;
*spac << game; *spac << game;
SendAsyncToClients(spac); SendAsyncToClients(std::move(spac));
return true; return true;
} }
@ -719,7 +719,7 @@ bool NetPlayServer::StartGame()
g_netplay_initial_gctime = Common::Timer::GetLocalTimeSinceJan1970(); g_netplay_initial_gctime = Common::Timer::GetLocalTimeSinceJan1970();
// tell clients to start game // tell clients to start game
sf::Packet* spac = new sf::Packet; auto spac = std::make_unique<sf::Packet>();
*spac << (MessageId)NP_MSG_START_GAME; *spac << (MessageId)NP_MSG_START_GAME;
*spac << m_current_game; *spac << m_current_game;
*spac << m_settings.m_CPUthread; *spac << m_settings.m_CPUthread;
@ -738,7 +738,7 @@ bool NetPlayServer::StartGame()
*spac << (u32)g_netplay_initial_gctime; *spac << (u32)g_netplay_initial_gctime;
*spac << (u32)(g_netplay_initial_gctime >> 32); *spac << (u32)(g_netplay_initial_gctime >> 32);
SendAsyncToClients(spac); SendAsyncToClients(std::move(spac));
m_is_running = true; m_is_running = true;

2
Source/Core/Core/NetPlayServer.h
View File

@ -22,7 +22,7 @@ class NetPlayServer : public TraversalClientClient
{ {
public: public:
void ThreadFunc(); void ThreadFunc();
void SendAsyncToClients(sf::Packet* packet); void SendAsyncToClients(std::unique_ptr<sf::Packet> packet);
NetPlayServer(const u16 port, bool traversal, const std::string& centralServer, u16 centralPort); NetPlayServer(const u16 port, bool traversal, const std::string& centralServer, u16 centralPort);
~NetPlayServer(); ~NetPlayServer();