From e2cf7775381750023a2dd685f4dd3e2e0fc2206b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 26 Apr 2018 15:54:01 +0200 Subject: [PATCH] output/alsa: simplify MultiSocketMonitor::GetEventLoop() calls --- src/output/plugins/AlsaOutputPlugin.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/output/plugins/AlsaOutputPlugin.cxx b/src/output/plugins/AlsaOutputPlugin.cxx index 1538d2aab..100643c4f 100644 --- a/src/output/plugins/AlsaOutputPlugin.cxx +++ b/src/output/plugins/AlsaOutputPlugin.cxx @@ -180,6 +180,8 @@ public: snd_config_update_free_global(); } + using MultiSocketMonitor::GetEventLoop; + gcc_pure const char *GetDevice() const noexcept { return device.empty() ? default_device : device.c_str(); @@ -791,7 +793,7 @@ AlsaOutput::Cancel() noexcept return; } - BlockingCall(MultiSocketMonitor::GetEventLoop(), [this](){ + BlockingCall(GetEventLoop(), [this](){ CancelInternal(); }); } @@ -800,7 +802,7 @@ void AlsaOutput::Close() noexcept { /* make sure the I/O thread isn't inside DispatchSockets() */ - BlockingCall(MultiSocketMonitor::GetEventLoop(), [this](){ + BlockingCall(GetEventLoop(), [this](){ MultiSocketMonitor::Reset(); defer_invalidate_sockets.Cancel(); });