From 9e8655fa1f662cd294f67bcf2397fd2bdd23edd1 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 5 Aug 2013 02:47:40 -0400 Subject: [PATCH] NetPlay: Remove some dead code --- Source/Core/Core/Src/NetPlay.h | 1 - Source/Core/Core/Src/NetPlayServer.cpp | 23 ----------------------- 2 files changed, 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 @@ -380,29 +380,6 @@ void NetPlayServer::UpdatePadMapping() } -// called from ---GUI--- thread and ---NETPLAY--- thread -u64 NetPlayServer::CalculateMinimumBufferTime() -{ - std::lock_guard lkp(m_crit.players); - - std::map::const_iterator - i = m_players.begin(), - e = m_players.end(); - std::priority_queue 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) {