mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

IGAIN is a better choice than IMIX for source volume.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@592 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-02-24 09:12:15 +00:00
parent b967aeb44a
commit 3374df571d
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/module-oss-mmap.c
View file

@ -248,7 +248,7 @@ static int sink_set_hw_volume(pa_sink *s) {
static int source_get_hw_volume(pa_source *s) { static int source_get_hw_volume(pa_source *s) {
struct userdata *u = s->userdata; 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)); pa_log_info(__FILE__": device doesn't support reading mixer settings: %s", strerror(errno));
s->get_hw_volume = NULL; s->get_hw_volume = NULL;
return -1; return -1;
@ -260,7 +260,7 @@ static int source_get_hw_volume(pa_source *s) {
static int source_set_hw_volume(pa_source *s) { static int source_set_hw_volume(pa_source *s) {
struct userdata *u = s->userdata; 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)); pa_log_info(__FILE__": device doesn't support writing mixer settings: %s", strerror(errno));
s->set_hw_volume = NULL; s->set_hw_volume = NULL;
return -1; return -1;

4
src/modules/module-oss.c
View file

@ -280,7 +280,7 @@ static int sink_set_hw_volume(pa_sink *s) {
static int source_get_hw_volume(pa_source *s) { static int source_get_hw_volume(pa_source *s) {
struct userdata *u = s->userdata; 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)); pa_log_info(__FILE__": device doesn't support reading mixer settings: %s", strerror(errno));
s->get_hw_volume = NULL; s->get_hw_volume = NULL;
return -1; return -1;
@ -292,7 +292,7 @@ static int source_get_hw_volume(pa_source *s) {
static int source_set_hw_volume(pa_source *s) { static int source_set_hw_volume(pa_source *s) {
struct userdata *u = s->userdata; 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)); pa_log_info(__FILE__": device doesn't support writing mixer settings: %s", strerror(errno));
s->set_hw_volume = NULL; s->set_hw_volume = NULL;
return -1; return -1;

8
src/modules/oss-util.c
View file

@ -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); 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) { 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_IMIX, ss, 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) { 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_IMIX, ss, 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) { int pa_oss_get_hw_description(const char *dev, char *name, size_t l) {

4
src/modules/oss-util.h
View file

@ -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_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_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_get_input_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_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); int pa_oss_get_hw_description(const char *dev, char *name, size_t l);