summaryrefslogtreecommitdiff
path: root/src/output/Control.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2017-06-08 09:49:30 +0200
committerMax Kellermann <max@musicpd.org>2017-06-08 09:55:49 +0200
commit3010d182fce271f391ca6e9f7c7819dac652931e (patch)
treeba31ebf05f200e7539461aac162f09475ed0b9d6 /src/output/Control.cxx
parenta72a02f0f2721e2a2490a5048841bb1ea7f46a30 (diff)
output/Internal: move "really_enabled" flag to class AudioOutputControl
Diffstat (limited to 'src/output/Control.cxx')
-rw-r--r--src/output/Control.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/output/Control.cxx b/src/output/Control.cxx
index 48436e5e3..bcc38f5be 100644
--- a/src/output/Control.cxx
+++ b/src/output/Control.cxx
@@ -132,7 +132,7 @@ AudioOutputControl::EnableAsync()
/* don't bother to start the thread now if the
device doesn't even have a enable() method;
just assign the variable and we're done */
- output->really_enabled = true;
+ really_enabled = true;
return;
}
@@ -147,11 +147,11 @@ AudioOutputControl::DisableAsync() noexcept
{
if (!thread.IsDefined()) {
if (output->plugin.disable == nullptr)
- output->really_enabled = false;
+ really_enabled = false;
else
/* if there's no thread yet, the device cannot
be enabled */
- assert(!output->really_enabled);
+ assert(!really_enabled);
return;
}
@@ -162,7 +162,7 @@ AudioOutputControl::DisableAsync() noexcept
void
AudioOutputControl::EnableDisableAsync()
{
- if (enabled == output->really_enabled)
+ if (enabled == really_enabled)
return;
if (enabled)
@@ -233,7 +233,7 @@ AudioOutputControl::LockUpdate(const AudioFormat audio_format,
{
const std::lock_guard<Mutex> protect(mutex);
- if (enabled && output->really_enabled) {
+ if (enabled && really_enabled) {
if (force || !fail_timer.IsDefined() ||
fail_timer.Check(REOPEN_AFTER * 1000)) {
return Open(audio_format, mp);