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

only reread volume if we actually have a good mixer. Closes #466

Browse source
This commit is contained in:
Lennart Poettering 2009-01-22 00:20:15 +01:00
parent 40f2e21aa7
commit 8519f54a0e
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -601,10 +601,10 @@ static int unsuspend(struct userdata *u) {
build_pollfd(u); build_pollfd(u);
if (u->sink) if (u->sink && u->sink->get_volume)
sink_get_volume(u->sink); u->sink->get_volume(u->sink);
if (u->source) if (u->source && u->source->get_volume)
source_get_volume(u->source); u->source->get_volume(u->source);
pa_log_info("Resumed successfully..."); pa_log_info("Resumed successfully...");
@ -1201,12 +1201,12 @@ int pa__init(pa_module*m) {
if (use_mmap && (!(caps & DSP_CAP_MMAP) || !(caps & DSP_CAP_TRIGGER))) { if (use_mmap && (!(caps & DSP_CAP_MMAP) || !(caps & DSP_CAP_TRIGGER))) {
pa_log_info("OSS device not mmap capable, falling back to UNIX read/write mode."); pa_log_info("OSS device not mmap capable, falling back to UNIX read/write mode.");
use_mmap = 0; use_mmap = FALSE;
} }
if (use_mmap && mode == O_WRONLY) { if (use_mmap && mode == O_WRONLY) {
pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode."); pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode.");
use_mmap = 0; use_mmap = FALSE;
} }
if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0) if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0)
@ -1235,6 +1235,7 @@ int pa__init(pa_module*m) {
m->userdata = u; m->userdata = u;
u->fd = fd; u->fd = fd;
u->mixer_fd = -1; u->mixer_fd = -1;
u->mixer_devmask = 0;
u->use_getospace = u->use_getispace = TRUE; u->use_getospace = u->use_getispace = TRUE;
u->use_getodelay = TRUE; u->use_getodelay = TRUE;
u->mode = mode; u->mode = mode;
@ -1383,7 +1384,6 @@ int pa__init(pa_module*m) {
if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) { if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) {
pa_bool_t do_close = TRUE; pa_bool_t do_close = TRUE;
u->mixer_devmask = 0;
if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0) if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno)); pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno));
@ -1409,6 +1409,7 @@ int pa__init(pa_module*m) {
if (do_close) { if (do_close) {
pa_close(u->mixer_fd); pa_close(u->mixer_fd);
u->mixer_fd = -1; u->mixer_fd = -1;
u->mixer_devmask = 0;
} }
} }