summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2021-08-06 17:59:26 +0200
committerMax Kellermann <max@musicpd.org>2021-08-06 18:03:36 +0200
commit351b39e0c5b70380074464522264e5106bf476da (patch)
treea264d2c7cc3e8e0ef15a12302ea14079d68f173c
parent3b6d4e66735a0ec9bfe205a528df1a617e78b575 (diff)
mixer/alsa: skip the snd_mixer_handle_events() call in alsa_mixer_elem_callback()
snd_mixer_handle_events() has already been called by DispatchSockets(). This way, we can also skip the exception handler.
-rw-r--r--src/mixer/plugins/AlsaMixerPlugin.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mixer/plugins/AlsaMixerPlugin.cxx b/src/mixer/plugins/AlsaMixerPlugin.cxx
index 17f38a14b..27243cfb4 100644
--- a/src/mixer/plugins/AlsaMixerPlugin.cxx
+++ b/src/mixer/plugins/AlsaMixerPlugin.cxx
@@ -166,11 +166,8 @@ AlsaMixer::ElemCallback(snd_mixer_elem_t *elem, unsigned mask) noexcept
snd_mixer_elem_get_callback_private(elem);
if (mask & SND_CTL_EVENT_MASK_VALUE) {
- try {
- int volume = mixer.GetVolume();
- mixer.listener.OnMixerVolumeChanged(mixer, volume);
- } catch (...) {
- }
+ int volume = mixer.GetPercentVolume();
+ mixer.listener.OnMixerVolumeChanged(mixer, volume);
}
return 0;