summaryrefslogtreecommitdiffstats
path: root/src/modules/oss-util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-02-21 00:14:25 +0000
committerLennart Poettering <lennart@poettering.net>2006-02-21 00:14:25 +0000
commit893204fd5789acff9ca03fe4d46beec5d55a6aa4 (patch)
treed71a148802ed806d95ae275acfc59f4629cd29e8 /src/modules/oss-util.c
parent86124abfe22016315729eebdabb280137480fbc5 (diff)
add hw volume control for module-oss-mmap
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@544 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/oss-util.c')
-rw-r--r--src/modules/oss-util.c36
1 files changed, 36 insertions, 0 deletions
diff --git a/src/modules/oss-util.c b/src/modules/oss-util.c
index e9a133f5..597d16d7 100644
--- a/src/modules/oss-util.c
+++ b/src/modules/oss-util.c
@@ -166,3 +166,39 @@ int pa_oss_set_fragments(int fd, int nfrags, int frag_size) {
return 0;
}
+
+int pa_oss_get_volume(int fd, const pa_sample_spec *ss, pa_cvolume *volume) {
+ char cv[PA_CVOLUME_SNPRINT_MAX];
+ unsigned vol;
+
+ assert(fd >= 0);
+ assert(ss);
+ assert(volume);
+
+ if (ioctl(fd, SOUND_MIXER_READ_PCM, &vol) < 0)
+ return -1;
+
+ volume->values[0] = ((vol & 0xFF) * PA_VOLUME_NORM) / 100;
+
+ if ((volume->channels = ss->channels) >= 2)
+ volume->values[1] = (((vol >> 8) & 0xFF) * PA_VOLUME_NORM) / 100;
+
+ pa_log_debug(__FILE__": Read mixer settings: %s\n", pa_cvolume_snprint(cv, sizeof(cv), volume));
+ return 0;
+}
+
+int pa_oss_set_volume(int fd, const pa_sample_spec *ss, const pa_cvolume *volume) {
+ char cv[PA_CVOLUME_SNPRINT_MAX];
+ unsigned vol;
+
+ vol = (volume->values[0]*100)/PA_VOLUME_NORM;
+
+ if (ss->channels >= 2)
+ vol |= ((volume->values[1]*100)/PA_VOLUME_NORM) << 8;
+
+ if (ioctl(fd, SOUND_MIXER_WRITE_PCM, &vol) < 0)
+ return -1;
+
+ pa_log_debug(__FILE__": Wrote mixer settings: %s\n", pa_cvolume_snprint(cv, sizeof(cv), volume));
+ return 0;
+}