[polypaudio-commits] r592 - in /trunk/src/modules: module-oss-mmap.c module-oss.c oss-util.c oss-util.h

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Fri Feb 24 10:12:15 2006
New Revision: 592

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=592&root=polypaudio&view=rev
Log:
IGAIN is a better choice than IMIX for source volume.

Modified:
    trunk/src/modules/module-oss-mmap.c
    trunk/src/modules/module-oss.c
    trunk/src/modules/oss-util.c
    trunk/src/modules/oss-util.h

Modified: trunk/src/modules/module-oss-mmap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-oss-mmap.c?rev=592&root=polypaudio&r1=591&r2=592&view=diff
==============================================================================
--- trunk/src/modules/module-oss-mmap.c (original)
+++ trunk/src/modules/module-oss-mmap.c Fri Feb 24 10:12:15 2006
@@ -248,7 +248,7 @@
 static int source_get_hw_volume(pa_source *s) {
     struct userdata *u = s->userdata;
 
-    if (pa_oss_get_imix_volume(u->fd, &s->sample_spec, &s->hw_volume) < 0) {
+    if (pa_oss_get_input_volume(u->fd, &s->sample_spec, &s->hw_volume) < 0) {
         pa_log_info(__FILE__": device doesn't support reading mixer settings: %s", strerror(errno));
         s->get_hw_volume = NULL;
         return -1;
@@ -260,7 +260,7 @@
 static int source_set_hw_volume(pa_source *s) {
     struct userdata *u = s->userdata;
 
-    if (pa_oss_set_imix_volume(u->fd, &s->sample_spec, &s->hw_volume) < 0) {
+    if (pa_oss_set_input_volume(u->fd, &s->sample_spec, &s->hw_volume) < 0) {
         pa_log_info(__FILE__": device doesn't support writing mixer settings: %s", strerror(errno));
         s->set_hw_volume = NULL;
         return -1;

Modified: trunk/src/modules/module-oss.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-oss.c?rev=592&root=polypaudio&r1=591&r2=592&view=diff
==============================================================================
--- trunk/src/modules/module-oss.c (original)
+++ trunk/src/modules/module-oss.c Fri Feb 24 10:12:15 2006
@@ -280,7 +280,7 @@
 static int source_get_hw_volume(pa_source *s) {
     struct userdata *u = s->userdata;
 
-    if (pa_oss_get_imix_volume(u->fd, &s->sample_spec, &s->hw_volume) < 0) {
+    if (pa_oss_get_input_volume(u->fd, &s->sample_spec, &s->hw_volume) < 0) {
         pa_log_info(__FILE__": device doesn't support reading mixer settings: %s", strerror(errno));
         s->get_hw_volume = NULL;
         return -1;
@@ -292,7 +292,7 @@
 static int source_set_hw_volume(pa_source *s) {
     struct userdata *u = s->userdata;
 
-    if (pa_oss_set_imix_volume(u->fd, &s->sample_spec, &s->hw_volume) < 0) {
+    if (pa_oss_set_input_volume(u->fd, &s->sample_spec, &s->hw_volume) < 0) {
         pa_log_info(__FILE__": device doesn't support writing mixer settings: %s", strerror(errno));
         s->set_hw_volume = NULL;
         return -1;

Modified: trunk/src/modules/oss-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/oss-util.c?rev=592&root=polypaudio&r1=591&r2=592&view=diff
==============================================================================
--- trunk/src/modules/oss-util.c (original)
+++ trunk/src/modules/oss-util.c Fri Feb 24 10:12:15 2006
@@ -211,12 +211,12 @@
     return pa_oss_set_volume(fd, SOUND_MIXER_WRITE_PCM, ss, volume);
 }
 
-int pa_oss_get_imix_volume(int fd, const pa_sample_spec *ss, pa_cvolume *volume) {
-    return pa_oss_get_volume(fd, SOUND_MIXER_READ_IMIX, ss, volume);
-}
-
-int pa_oss_set_imix_volume(int fd, const pa_sample_spec *ss, const pa_cvolume *volume) {
-    return pa_oss_set_volume(fd, SOUND_MIXER_WRITE_IMIX, ss, volume);
+int pa_oss_get_input_volume(int fd, const pa_sample_spec *ss, pa_cvolume *volume) {
+    return pa_oss_get_volume(fd, SOUND_MIXER_READ_IGAIN, ss, volume);
+}
+
+int pa_oss_set_input_volume(int fd, const pa_sample_spec *ss, const pa_cvolume *volume) {
+    return pa_oss_set_volume(fd, SOUND_MIXER_WRITE_IGAIN, ss, volume);
 }
 
 int pa_oss_get_hw_description(const char *dev, char *name, size_t l) {

Modified: trunk/src/modules/oss-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/oss-util.h?rev=592&root=polypaudio&r1=591&r2=592&view=diff
==============================================================================
--- trunk/src/modules/oss-util.h (original)
+++ trunk/src/modules/oss-util.h Fri Feb 24 10:12:15 2006
@@ -33,8 +33,8 @@
 int pa_oss_get_pcm_volume(int fd, const pa_sample_spec *ss, pa_cvolume *volume);
 int pa_oss_set_pcm_volume(int fd, const pa_sample_spec *ss, const pa_cvolume *volume);
 
-int pa_oss_get_imix_volume(int fd, const pa_sample_spec *ss, pa_cvolume *volume);
-int pa_oss_set_imix_volume(int fd, const pa_sample_spec *ss, const pa_cvolume *volume);
+int pa_oss_get_input_volume(int fd, const pa_sample_spec *ss, pa_cvolume *volume);
+int pa_oss_set_input_volume(int fd, const pa_sample_spec *ss, const pa_cvolume *volume);
 
 int pa_oss_get_hw_description(const char *dev, char *name, size_t l);