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

output/Plugin: delay() returns std::chrono::steady_clock::duration

Browse Source
This commit is contained in:
Max Kellermann
2016-12-28 21:44:18 +01:00
parent 871ba5a488
commit d5e422970c
16 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/output/plugins/httpd/HttpdOutputPlugin.cxx
View File

@@ -344,7 +344,7 @@ HttpdOutput::SendHeader(HttpdClient &client) const
client.PushPage(header);
}
inline unsigned
inline std::chrono::steady_clock::duration
HttpdOutput::Delay() const
{
if (!LockHasClients() && base.pause) {
@@ -357,15 +357,15 @@ HttpdOutput::Delay() const
/* some arbitrary delay that is long enough to avoid
consuming too much CPU, and short enough to notice
new clients quickly enough */
return 1000;
return std::chrono::seconds(1);
}
return timer->IsStarted()
? timer->GetDelay()
: 0;
? std::chrono::milliseconds(timer->GetDelay())
: std::chrono::steady_clock::duration::zero();
}
static unsigned
static std::chrono::steady_clock::duration
httpd_output_delay(AudioOutput *ao)
{
HttpdOutput *httpd = HttpdOutput::Cast(ao);