Merge branch 'v0.20.x'

2017-05-16 10:09:20 +02:00
parent c5996c0593 f7fffc9be8
commit 0a3a5a7c65
7 changed files with 23 additions and 10 deletions
@@ -98,7 +98,7 @@ public:
 	void Open(AudioFormat &audio_format);
 	void Close();

-	std::chrono::steady_clock::duration Delay() {
+	std::chrono::steady_clock::duration Delay() noexcept {
 		return pause && !cancel
 			? std::chrono::milliseconds(100)
 			: std::chrono::steady_clock::duration::zero();