diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-08-05 02:47:40 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-08-05 04:25:16 -0400 |
| commit | 9e8655fa1f662cd294f67bcf2397fd2bdd23edd1 (patch) | |
| tree | 16f80fd9165c7ab4cdf743ea45ca794ae45ad5d7 /Source/Core | |
| parent | 25fc0c27f356e3f3659ae854b2b2503bc4497ac8 (diff) | |
NetPlay: Remove some dead code
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/NetPlay.h | 1 | ||||
| -rw-r--r-- | Source/Core/Core/Src/NetPlayServer.cpp | 23 |
2 files changed, 0 insertions, 24 deletions
diff --git a/Source/Core/Core/Src/NetPlay.h b/Source/Core/Core/Src/NetPlay.h index 222fb680cf..7adf0c26a1 100644 --- a/Source/Core/Core/Src/NetPlay.h +++ b/Source/Core/Core/Src/NetPlay.h @@ -200,7 +200,6 @@ public: bool GetPadMapping(const int pid, int map[]); bool SetPadMapping(const int pid, const int map[]); - u64 CalculateMinimumBufferTime(); void AdjustPadBufferSize(unsigned int size); #ifdef USE_UPNP diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index db3a41a398..bd5d74f0da 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -381,29 +381,6 @@ void NetPlayServer::UpdatePadMapping() } // called from ---GUI--- thread and ---NETPLAY--- thread -u64 NetPlayServer::CalculateMinimumBufferTime() -{ - std::lock_guard<std::recursive_mutex> lkp(m_crit.players); - - std::map<sf::SocketTCP, Client>::const_iterator - i = m_players.begin(), - e = m_players.end(); - std::priority_queue<unsigned int> pings; - for ( ;i!=e; ++i) - pings.push(i->second.ping/2); - - unsigned int required_ms = pings.top(); - // if there is more than 1 client, buffersize must be >= (2 highest ping times combined) - if (pings.size() > 1) - { - pings.pop(); - required_ms += pings.top(); - } - - return required_ms; -} - -// called from ---GUI--- thread and ---NETPLAY--- thread void NetPlayServer::AdjustPadBufferSize(unsigned int size) { std::lock_guard<std::recursive_mutex> lkg(m_crit.game); |
