IGAIN is a better choice than IMIX for source volume.

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

4 files changed, 10 insertions, 10 deletions

diff --git a/src/modules/module-oss-mmap.c b/src/modules/module-oss-mmap.c
index e1e54fb5..0ed2af93 100644
--- a/src/modules/module-oss-mmap.c
+++ b/src/modules/module-oss-mmap.c
@@ -248,7 +248,7 @@ static int sink_set_hw_volume(pa_sink *s) {
 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_get_hw_volume(pa_source *s) {
 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;
diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c
index 3a3f6b88..52427592 100644
--- a/src/modules/module-oss.c
+++ b/src/modules/module-oss.c
@@ -280,7 +280,7 @@ static int sink_set_hw_volume(pa_sink *s) {
 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_get_hw_volume(pa_source *s) {
 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;
diff --git a/src/modules/oss-util.c b/src/modules/oss-util.c
index 30a4b998..958bd547 100644
--- a/src/modules/oss-util.c
+++ b/src/modules/oss-util.c
@@ -211,12 +211,12 @@ int pa_oss_set_pcm_volume(int fd, const pa_sample_spec *ss, const pa_cvolume *vo
     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_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_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_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) {
diff --git a/src/modules/oss-util.h b/src/modules/oss-util.h
index dd494d0c..c652d2a1 100644
--- a/src/modules/oss-util.h
+++ b/src/modules/oss-util.h
@@ -33,8 +33,8 @@ int pa_oss_set_fragments(int fd, int frags, int frag_size);
 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);