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.

mixer/alsa: skip the snd_mixer_handle_events() call in alsa_mixer_elem_callback()
351b39e0 · Max Kellermann · 3b6d4e66 · 351b39e0
Commit 351b39e0 authored Aug 06, 2021 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

AlsaMixerPlugin.cxx src/mixer/plugins/AlsaMixerPlugin.cxx +2 -5

No files found.
--- 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;