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

output/pulse: eliminate the pause field

Browse Source 
It is useless, because we're always checking pa_stream_is_corked().
This commit is contained in:
Max Kellermann
2021-02-15 15:58:33 +01:00
parent 6d2b09ac2b
commit def120aca4
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/plugins/PulseOutputPlugin.cxx
View File

@@ -56,8 +56,6 @@ class PulseOutput final : AudioOutput {
size_t writable; size_t writable;
bool pause;
/** /**
* Was Interrupt() called? This will unblock Play(). It will * Was Interrupt() called? This will unblock Play(). It will
* be reset by Cancel() and Pause(), as documented by the * 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"); "pa_stream_connect_playback() has failed");
} }
pause = false;
interrupted = false; interrupted = false;
} }
@@ -780,7 +777,7 @@ PulseOutput::Delay() const noexcept
Pulse::LockGuard lock(mainloop); Pulse::LockGuard lock(mainloop);
auto result = std::chrono::steady_clock::duration::zero(); 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) pa_stream_get_state(stream) == PA_STREAM_READY)
/* idle while paused */ /* idle while paused */
result = std::chrono::seconds(1); result = std::chrono::seconds(1);
@@ -796,8 +793,6 @@ PulseOutput::Play(const void *chunk, size_t size)
Pulse::LockGuard lock(mainloop); Pulse::LockGuard lock(mainloop);
pause = false;
/* check if the stream is (already) connected */ /* check if the stream is (already) connected */
WaitStream(); WaitStream();
@@ -876,7 +871,6 @@ PulseOutput::Pause()
Pulse::LockGuard lock(mainloop); Pulse::LockGuard lock(mainloop);
pause = true;
interrupted = false; interrupted = false;
/* check if the stream is (already/still) connected */ /* check if the stream is (already/still) connected */