Skip to content

M
mpd
Commit e2cf7775 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output/alsa: simplify MultiSocketMonitor::GetEventLoop() calls

parent 9c617607
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
src/output/plugins/AlsaOutputPlugin.cxx
View file @ e2cf7775
...@@ -180,6 +180,8 @@ public: ...@@ -180,6 +180,8 @@ public:
snd_config_update_free_global(); snd_config_update_free_global();
} }
using MultiSocketMonitor::GetEventLoop;
gcc_pure gcc_pure
const char *GetDevice() const noexcept { const char *GetDevice() const noexcept {
return device.empty() ? default_device : device.c_str(); return device.empty() ? default_device : device.c_str();
...@@ -791,7 +793,7 @@ AlsaOutput::Cancel() noexcept ...@@ -791,7 +793,7 @@ AlsaOutput::Cancel() noexcept
return; return;
} }
BlockingCall(MultiSocketMonitor::GetEventLoop(), [this](){ BlockingCall(GetEventLoop(), [this](){
CancelInternal(); CancelInternal();
}); });
} }
...@@ -800,7 +802,7 @@ void ...@@ -800,7 +802,7 @@ void
AlsaOutput::Close() noexcept AlsaOutput::Close() noexcept
{ {
/* make sure the I/O thread isn't inside DispatchSockets() */ /* make sure the I/O thread isn't inside DispatchSockets() */
BlockingCall(MultiSocketMonitor::GetEventLoop(), [this](){ BlockingCall(GetEventLoop(), [this](){
MultiSocketMonitor::Reset(); MultiSocketMonitor::Reset();
defer_invalidate_sockets.Cancel(); defer_invalidate_sockets.Cancel();
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment