aboutsummaryrefslogtreecommitdiff
path: root/src/mixer
diff options
context:
space:
mode:
Diffstat (limited to 'src/mixer')
-rw-r--r--src/mixer/alsa_mixer.c4
-rw-r--r--src/mixer/oss_mixer.c4
2 files changed, 1 insertions, 7 deletions
diff --git a/src/mixer/alsa_mixer.c b/src/mixer/alsa_mixer.c
index 6c7476ab..7b161cd1 100644
--- a/src/mixer/alsa_mixer.c
+++ b/src/mixer/alsa_mixer.c
@@ -188,10 +188,6 @@ alsa_mixer_set_volume(struct mixer *mixer, unsigned volume)
vol = volume;
am->volume_set = vol + 0.5;
- am->volume_set = am->volume_set > 100
- ? 100 :
- (am->volume_set < 0
- ? 0 : am->volume_set);
level = (long)(((vol / 100.0) * (am->volume_max - am->volume_min) +
am->volume_min) + 0.5);
diff --git a/src/mixer/oss_mixer.c b/src/mixer/oss_mixer.c
index 85b59fbe..f2db01ff 100644
--- a/src/mixer/oss_mixer.c
+++ b/src/mixer/oss_mixer.c
@@ -171,9 +171,7 @@ oss_mixer_set_volume(struct mixer *mixer, unsigned volume)
int ret;
assert(om->device_fd >= 0);
-
- if (volume > 100)
- volume = 100;
+ assert(volume <= 100);
level = (volume << 8) + volume;