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

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

This commit is contained in:
Max Kellermann 2018-04-26 15:54:01 +02:00
parent 9c61760713
commit e2cf777538
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/output/plugins/AlsaOutputPlugin.cxx
View File

@ -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
return; return;
} }
BlockingCall(MultiSocketMonitor::GetEventLoop(), [this](){ BlockingCall(GetEventLoop(), [this](){
CancelInternal(); CancelInternal();
}); });
} }
@ -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();
}); });