piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

NetPlay: use a workaround from comex’s dc-netplay to interrupt enet

Browse Source
This commit is contained in:
mathieui
2015-03-09 17:31:13 +01:00
parent 27619e613f
commit 603fe25349
4 changed files with 163 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/NetPlayClient.h
View File

@ -47,6 +47,8 @@ class NetPlayClient : public TraversalClientClient
{
public:
void ThreadFunc();
void RunOnThread(std::function<void()> func);
void WakeupThread(ENetHost* host);
NetPlayClient(const std::string& address, const u16 port, NetPlayUI* dialog, const std::string& name, bool traversal, std::string centralServer, u16 centralPort);
~NetPlayClient();
@ -92,9 +94,12 @@ protected:
{
std::recursive_mutex game;
// lock order
std::recursive_mutex players, send;
std::recursive_mutex players;
std::recursive_mutex run_queue_write;
} m_crit;
Common::FifoQueue<std::function<void()>, false> m_run_queue;
Common::FifoQueue<GCPadStatus> m_pad_buffer[4];
Common::FifoQueue<NetWiimote> m_wiimote_buffer[4];