diff options
Diffstat (limited to 'src/mixer/AlsaMixerPlugin.cxx')
| -rw-r--r-- | src/mixer/AlsaMixerPlugin.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mixer/AlsaMixerPlugin.cxx b/src/mixer/AlsaMixerPlugin.cxx index 4a4ca433c..75ba8825c 100644 --- a/src/mixer/AlsaMixerPlugin.cxx +++ b/src/mixer/AlsaMixerPlugin.cxx @@ -27,6 +27,7 @@ #include "event/Call.hxx" #include "util/ASCII.hxx" #include "util/ReusableArray.hxx" +#include "util/Clamp.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" #include "Log.hxx" @@ -47,7 +48,7 @@ class AlsaMixerMonitor final : private MultiSocketMonitor { public: AlsaMixerMonitor(EventLoop &_loop, snd_mixer_t *_mixer) :MultiSocketMonitor(_loop), mixer(_mixer) { -#ifdef USE_EPOLL +#ifdef USE_INTERNAL_EVENTLOOP _loop.AddCall([this](){ InvalidateSockets(); }); #else _loop.AddIdle(InitAlsaMixerMonitor, this); @@ -55,7 +56,7 @@ public: } private: -#ifndef USE_EPOLL +#ifndef USE_INTERNAL_EVENTLOOP static gboolean InitAlsaMixerMonitor(gpointer data) { AlsaMixerMonitor &amm = *(AlsaMixerMonitor *)data; amm.InvalidateSockets(); @@ -372,8 +373,7 @@ AlsaMixer::SetVolume(unsigned volume, Error &error) level = (long)(((vol / 100.0) * (volume_max - volume_min) + volume_min) + 0.5); - level = level > volume_max ? volume_max : level; - level = level < volume_min ? volume_min : level; + level = Clamp(level, volume_min, volume_max); err = snd_mixer_selem_set_playback_volume_all(elem, level); if (err < 0) { |