diff options
| author | Max Kellermann <max@musicpd.org> | 2021-02-15 15:58:33 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2021-02-15 15:59:46 +0100 |
| commit | def120aca4c6fd2dccdc9f36f64f66bdbaa58a8d (patch) | |
| tree | d1b9610b0bdf9c25705527b40440230b2588a80d /src/output | |
| parent | 6d2b09ac2b4eb2e7d477e6fa128db7f057b2531c (diff) | |
output/pulse: eliminate the `pause` field
It is useless, because we're always checking pa_stream_is_corked().
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/plugins/PulseOutputPlugin.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/output/plugins/PulseOutputPlugin.cxx b/src/output/plugins/PulseOutputPlugin.cxx index a2adf4e54..c615853d6 100644 --- a/src/output/plugins/PulseOutputPlugin.cxx +++ b/src/output/plugins/PulseOutputPlugin.cxx @@ -56,8 +56,6 @@ class PulseOutput final : AudioOutput { size_t writable; - bool pause; - /** * Was Interrupt() called? This will unblock Play(). It will * be reset by Cancel() and Pause(), as documented by the @@ -688,7 +686,6 @@ PulseOutput::Open(AudioFormat &audio_format) "pa_stream_connect_playback() has failed"); } - pause = false; interrupted = false; } @@ -780,7 +777,7 @@ PulseOutput::Delay() const noexcept Pulse::LockGuard lock(mainloop); auto result = std::chrono::steady_clock::duration::zero(); - if (pause && pa_stream_is_corked(stream) && + if (pa_stream_is_corked(stream) && pa_stream_get_state(stream) == PA_STREAM_READY) /* idle while paused */ result = std::chrono::seconds(1); @@ -796,8 +793,6 @@ PulseOutput::Play(const void *chunk, size_t size) Pulse::LockGuard lock(mainloop); - pause = false; - /* check if the stream is (already) connected */ WaitStream(); @@ -876,7 +871,6 @@ PulseOutput::Pause() Pulse::LockGuard lock(mainloop); - pause = true; interrupted = false; /* check if the stream is (already/still) connected */ |