summaryrefslogtreecommitdiffstats
path: root/src/modules/oss/module-oss.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-01-22 00:20:15 +0100
committerLennart Poettering <lennart@poettering.net>2009-01-22 00:26:29 +0100
commit8519f54a0eaefb0e84586b354c260a999a595e22 (patch)
treea8ca95bd469d92ec239954406a49461532107496 /src/modules/oss/module-oss.c
parent40f2e21aa731c56353dc75a4ad4effcb88b41916 (diff)
only reread volume if we actually have a good mixer. Closes #466
Diffstat (limited to 'src/modules/oss/module-oss.c')
-rw-r--r--src/modules/oss/module-oss.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/modules/oss/module-oss.c b/src/modules/oss/module-oss.c
index 23a32549..79cbf67a 100644
--- a/src/modules/oss/module-oss.c
+++ b/src/modules/oss/module-oss.c
@@ -601,10 +601,10 @@ static int unsuspend(struct userdata *u) {
build_pollfd(u);
- if (u->sink)
- sink_get_volume(u->sink);
- if (u->source)
- source_get_volume(u->source);
+ if (u->sink && u->sink->get_volume)
+ u->sink->get_volume(u->sink);
+ if (u->source && u->source->get_volume)
+ u->source->get_volume(u->source);
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))) {
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) {
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)
@@ -1235,6 +1235,7 @@ int pa__init(pa_module*m) {
m->userdata = u;
u->fd = fd;
u->mixer_fd = -1;
+ u->mixer_devmask = 0;
u->use_getospace = u->use_getispace = TRUE;
u->use_getodelay = TRUE;
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) {
pa_bool_t do_close = TRUE;
- 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));
@@ -1409,6 +1409,7 @@ int pa__init(pa_module*m) {
if (do_close) {
pa_close(u->mixer_fd);
u->mixer_fd = -1;
+ u->mixer_devmask = 0;
}
}