add proper volume clipping support for OSS devices

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@665 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/modules/oss-util.c b/src/modules/oss-util.c
index 958bd547d03d0d1fbd0822a2d0f458b335de9c1f..fac39e7bc6df624ff9c8870c2eeebfcab7314595 100644 (file)
--- 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;