summaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-04-08 00:19:29 +0000
committerLennart Poettering <lennart@poettering.net>2006-04-08 00:19:29 +0000
commit025228f957b9212f889168a61497b6b3470fca20 (patch)
treed1713ac807a6f6575c5e5508781fcd7c7da74b1f /src/modules
parentb4a547419c0815add1fc91d35d2a483c5a0e7c20 (diff)
add proper volume clipping support for OSS devices
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@665 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/oss-util.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/modules/oss-util.c b/src/modules/oss-util.c
index 958bd547..fac39e7b 100644
--- a/src/modules/oss-util.c
+++ b/src/modules/oss-util.c
@@ -190,11 +190,16 @@ static int pa_oss_get_volume(int fd, int mixer, const pa_sample_spec *ss, pa_cvo
static int pa_oss_set_volume(int fd, int mixer, const pa_sample_spec *ss, const pa_cvolume *volume) {
char cv[PA_CVOLUME_SNPRINT_MAX];
unsigned vol;
+ pa_volume_t l, r;
- vol = (volume->values[0]*100)/PA_VOLUME_NORM;
+ l = volume->values[0] > PA_VOLUME_NORM ? PA_VOLUME_NORM : volume->values[0];
- if (ss->channels >= 2)
- vol |= ((volume->values[1]*100)/PA_VOLUME_NORM) << 8;
+ vol = (l*100)/PA_VOLUME_NORM;
+
+ if (ss->channels >= 2) {
+ r = volume->values[1] > PA_VOLUME_NORM ? PA_VOLUME_NORM : volume->values[1];
+ vol |= ((r*100)/PA_VOLUME_NORM) << 8;
+ }
if (ioctl(fd, mixer, &vol) < 0)
return -1;