Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann
2017-05-16 10:09:20 +02:00
7 changed files with 23 additions and 10 deletions

View File

@@ -101,7 +101,7 @@ public:
void Open(AudioFormat &audio_format);
void Close();
std::chrono::steady_clock::duration Delay();
std::chrono::steady_clock::duration Delay() noexcept;
size_t Play(const void *chunk, size_t size);
void Cancel();
bool Pause();
@@ -741,7 +741,7 @@ PulseOutput::StreamPause(bool pause)
}
inline std::chrono::steady_clock::duration
PulseOutput::Delay()
PulseOutput::Delay() noexcept
{
Pulse::LockGuard lock(mainloop);