diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | src/mixer/AlsaMixerPlugin.cxx | 21 |
2 files changed, 23 insertions, 2 deletions
@@ -28,6 +28,10 @@ ver 0.18 (2012/??/??) * improved decoder/output error reporting * eliminate timer wakeup on idle MPD +ver 0.17.6 (not yet released) +* mixer: + - alsa: fix busy loop when USB sound device gets unplugged + ver 0.17.5 (2013/08/04) * protocol: - fix "playlistadd" with URI diff --git a/src/mixer/AlsaMixerPlugin.cxx b/src/mixer/AlsaMixerPlugin.cxx index 1ea26d0c1..13e3283f0 100644 --- a/src/mixer/AlsaMixerPlugin.cxx +++ b/src/mixer/AlsaMixerPlugin.cxx @@ -38,7 +38,7 @@ static constexpr unsigned VOLUME_MIXER_ALSA_INDEX_DEFAULT = 0; class AlsaMixerMonitor final : private MultiSocketMonitor { - snd_mixer_t *const mixer; + snd_mixer_t *mixer; ReusableArray<pollfd> pfd_buffer; @@ -83,6 +83,9 @@ static constexpr Domain alsa_mixer_domain("alsa_mixer"); int AlsaMixerMonitor::PrepareSockets() { + if (mixer == nullptr) + return -1; + int count = snd_mixer_poll_descriptors_count(mixer); if (count < 0) count = 0; @@ -117,7 +120,21 @@ AlsaMixerMonitor::PrepareSockets() void AlsaMixerMonitor::DispatchSockets() { - snd_mixer_handle_events(mixer); + assert(mixer != nullptr); + + int err = snd_mixer_handle_events(mixer); + if (err < 0) { + g_warning("snd_mixer_handle_events() failed: %s", + snd_strerror(err)); + + if (err == -ENODEV) { + /* the sound device was unplugged; disable + this GSource */ + mixer = nullptr; + InvalidateSockets(); + return; + } + } } /* |