oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/upnp/Discovery: use std::chrono::steady_clock

Browse Source
This commit is contained in:
Max Kellermann
2016-12-28 22:03:19 +01:00
parent 4e60ab7f53
commit cd607cb280
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/upnp/Discovery.cxx
View File

@@ -20,7 +20,6 @@
#include "config.h"
#include "Discovery.hxx"
#include "ContentDirectoryService.hxx"
#include "system/Clock.hxx"
#include "Log.hxx"
#include "util/ScopeExit.hxx"
#include "util/RuntimeError.hxx"
@@ -132,7 +131,8 @@ UPnPDeviceDirectory::Explore()
// Update or insert the device
ContentDirectoryDescriptor d(std::move(tsk->device_id),
MonotonicClockS(), tsk->expires);
std::chrono::steady_clock::now(),
tsk->expires);
try {
d.Parse(tsk->url, buf);
@@ -209,7 +209,7 @@ UPnPDeviceDirectory::Invoke(Upnp_EventType et, void *evp)
void
UPnPDeviceDirectory::ExpireDevices()
{
const unsigned now = MonotonicClockS();
const auto now = std::chrono::steady_clock::now();
bool didsomething = false;
for (auto it = directories.begin();
@@ -251,8 +251,8 @@ UPnPDeviceDirectory::Start()
void
UPnPDeviceDirectory::Search()
{
const unsigned now = MonotonicClockS();
if (now - last_search < 10)
const auto now = std::chrono::steady_clock::now();
if (now - last_search < std::chrono::seconds(10))
return;
last_search = now;