diff options
| author | Max Kellermann <max@duempel.org> | 2013-12-22 21:08:06 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-12-22 21:08:06 +0100 |
| commit | 86e72ffefb886f6151add595fa33028859249d59 (patch) | |
| tree | b1678609df9c9875be5510205db8c90461eeff38 /src/mixer | |
| parent | 6416198e9f57e4ea59a9bdc4deb2856c562681e6 (diff) | |
| download | mpd-86e72ffefb886f6151add595fa33028859249d59.tar.gz mpd-86e72ffefb886f6151add595fa33028859249d59.tar.xz mpd-86e72ffefb886f6151add595fa33028859249d59.zip | |
util/Clamp: generic Clamp() function
Diffstat (limited to 'src/mixer')
| -rw-r--r-- | src/mixer/AlsaMixerPlugin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mixer/AlsaMixerPlugin.cxx b/src/mixer/AlsaMixerPlugin.cxx index d643a3325..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" @@ -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) { |