From 3b6d4e66735a0ec9bfe205a528df1a617e78b575 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 6 Aug 2021 18:00:04 +0200 Subject: mixer/alsa: move alsa_mixer_elem_callback() into the AlsaMixer class --- src/mixer/plugins/AlsaMixerPlugin.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mixer/plugins/AlsaMixerPlugin.cxx b/src/mixer/plugins/AlsaMixerPlugin.cxx index 844b56105..17f38a14b 100644 --- a/src/mixer/plugins/AlsaMixerPlugin.cxx +++ b/src/mixer/plugins/AlsaMixerPlugin.cxx @@ -112,6 +112,10 @@ private: unsigned GetPercentVolume() const noexcept { return NormalizedToPercent(GetNormalizedVolume()); } + + static int ElemCallback(snd_mixer_elem_t *elem, + unsigned mask) noexcept; + }; static constexpr Domain alsa_mixer_domain("alsa_mixer"); @@ -155,8 +159,8 @@ AlsaMixerMonitor::DispatchSockets() noexcept * */ -static int -alsa_mixer_elem_callback(snd_mixer_elem_t *elem, unsigned mask) +int +AlsaMixer::ElemCallback(snd_mixer_elem_t *elem, unsigned mask) noexcept { AlsaMixer &mixer = *(AlsaMixer *) snd_mixer_elem_get_callback_private(elem); @@ -244,7 +248,7 @@ AlsaMixer::Setup() throw FormatRuntimeError("no such mixer control: %s", control); snd_mixer_elem_set_callback_private(elem, this); - snd_mixer_elem_set_callback(elem, alsa_mixer_elem_callback); + snd_mixer_elem_set_callback(elem, ElemCallback); monitor = new AlsaMixerMonitor(event_loop, handle); } -- cgit v1.2.3