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

Fix multiplayer wiimote netplay.

Browse Source
This commit is contained in:
Rachel Bryk
2013-08-07 18:00:38 -04:00
parent 011bcfee34
commit f51cb0b7eb
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Core/Src/NetPlayClient.cpp
View File

@ -500,8 +500,6 @@ void NetPlayClient::ClearBuffers()
while (m_wiimote_buffer[i].Size()) while (m_wiimote_buffer[i].Size())
m_wiimote_buffer[i].Pop(); m_wiimote_buffer[i].Pop();
m_wiimote_input[i].data.clear();
} }
} }
@ -565,6 +563,7 @@ bool NetPlayClient::GetNetPads(const u8 pad_nb, const SPADStatus* const pad_stat
// called from ---CPU--- thread // called from ---CPU--- thread
bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size) bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size)
{ {
NetWiimote nw;
{ {
std::lock_guard<std::recursive_mutex> lkp(m_crit.players); std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
@ -579,25 +578,24 @@ bool NetPlayClient::WiimoteUpdate(int _number, u8* data, u8 size)
if (previousSize != size && m_wiimote_buffer[in_game_num].Size() > 0) if (previousSize != size && m_wiimote_buffer[in_game_num].Size() > 0)
{ {
// Reporting mode changed, so previous buffer is no good. // Reporting mode changed, so previous buffer is no good.
m_wiimote_buffer[_number].Clear(); m_wiimote_buffer[in_game_num].Clear();
} }
m_wiimote_input[in_game_num].data.assign(data, data + size); nw.data.assign(data, data + size);
m_wiimote_input[in_game_num].size = size; nw.size = size;
while (m_wiimote_buffer[in_game_num].Size() <= m_target_buffer_size) while (m_wiimote_buffer[in_game_num].Size() <= m_target_buffer_size)
{ {
// add to buffer // add to buffer
m_wiimote_buffer[in_game_num].Push(m_wiimote_input[in_game_num]); m_wiimote_buffer[in_game_num].Push(nw);
// send // send
SendWiimoteState(_number, m_wiimote_input[_number]); SendWiimoteState(_number, nw);
} }
previousSize = size; previousSize = size;
} }
} // unlock players } // unlock players
NetWiimote nw;
while (!m_wiimote_buffer[_number].Pop(nw)) while (!m_wiimote_buffer[_number].Pop(nw))
{ {
// wait for receiving thread to push some data // wait for receiving thread to push some data

2
Source/Core/Core/Src/NetPlayClient.h
View File

@ -100,8 +100,6 @@ protected:
Common::FifoQueue<NetPad> m_pad_buffer[4]; Common::FifoQueue<NetPad> m_pad_buffer[4];
Common::FifoQueue<NetWiimote> m_wiimote_buffer[4]; Common::FifoQueue<NetWiimote> m_wiimote_buffer[4];
NetWiimote m_wiimote_input[4];
NetPlayUI* m_dialog; NetPlayUI* m_dialog;
sf::SocketTCP m_socket; sf::SocketTCP m_socket;
std::thread m_thread; std::thread m_thread;