Replace deprecated boost timer

Signed-off-by: Patrik Dahlström <risca@powerlamerz.org>

Author: Risca

plex/CMakeModules/PlatformConfigLINUX.cmake

@@ -64,7 +64,7 @@ foreach(l ${LINK_PKG})
   plex_find_package(${l} 1 1)
 endforeach()
 
-find_package(Boost COMPONENTS thread system REQUIRED)
+find_package(Boost COMPONENTS thread system timer REQUIRED)
 if(Boost_FOUND)
   include_directories(${Boost_INCLUDE_DIRS})
   list(APPEND CONFIG_PLEX_LINK_LIBRARIES ${Boost_LIBRARIES})

plex/Client/PlexServer.cpp

@@ -9,7 +9,7 @@
 #include "PlexTranscoderClient.h"
 
 #include <boost/foreach.hpp>
-#include <boost/timer.hpp>
+#include <boost/timer/timer.hpp>
 #include <settings/AdvancedSettings.h>
 
 using namespace std;
@@ -233,7 +233,7 @@ bool CPlexServer::UpdateReachability()
   if (m_connections.size() == 0)
     return false;
 
-  m_connTestTimer.restart();
+  boost::timer::cpu_timer timer; // start timer
   CLog::Log(LOGDEBUG, "CPlexServer::UpdateReachability Updating reachability for %s with %ld connections.", m_name.c_str(), m_connections.size());
 
   m_bestConnection.reset();
@@ -281,9 +281,10 @@ bool CPlexServer::UpdateReachability()
   CSingleLock tlk(m_testingLock);
   m_complete = true;
   m_activeConnection = m_bestConnection;
+  timer.stop();
 
-  CLog::Log(LOGDEBUG, "CPlexServer::UpdateReachability Connectivity test to %s completed in %.1f Seconds -> %s",
-            m_name.c_str(), m_connTestTimer.elapsed(), m_activeConnection ? m_activeConnection->toString().c_str() : "FAILED");
+  CLog::Log(LOGDEBUG, "CPlexServer::UpdateReachability Connectivity test to %s completed in %s Seconds -> %s",
+            m_name.c_str(), timer.format(1, "%w").c_str(), m_activeConnection ? m_activeConnection->toString().c_str() : "FAILED");
 
   return (bool)m_bestConnection;
 }

plex/Client/PlexServer.h

@@ -5,7 +5,6 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/timer.hpp>
 
 #include "threads/CriticalSection.h"
 #include "Job.h"
@@ -151,8 +150,6 @@ class CPlexServer : public boost::enable_shared_from_this<CPlexServer>
   int m_connectionsLeft;
   bool m_complete;
 
-  boost::timer m_connTestTimer;
-
   CCriticalSection m_serverLock;
 
   CCriticalSection m_testingLock;

plex/Home/GUIWindowHome.h

@@ -27,7 +27,6 @@
 #include "guilib/GUIWindow.h"
 #include "guilib/GUIStaticItem.h"
 #include "Job.h"
-#include <boost/timer.hpp>
 
 #include "VideoThumbLoader.h"
 #include "MusicThumbLoader.h"

plex/Network/NetworkServiceAdvertiser.h

@@ -12,7 +12,6 @@
 #include <boost/foreach.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
-#include <boost/timer.hpp>
 
 #include "NetworkService.h"
 #include "NetworkServiceBase.h"

plex/Network/NetworkServiceBrowser.h

@@ -17,7 +17,6 @@
 #include <boost/asio.hpp>
 #include <boost/foreach.hpp>
 #include <boost/thread.hpp>
-#include <boost/timer.hpp>
 
 #include "NetworkInterface.h"
 #include "NetworkServiceBase.h"

plex/Remote/PlexRemoteSubscriberManager.h

@@ -11,7 +11,6 @@
 
 #include <map>
 #include <boost/shared_ptr.hpp>
-#include <boost/timer.hpp>
 #include "PlexGlobalTimer.h"
 #include "threads/Event.h"
 #include "URL.h"