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

minor cleanups and optimizations

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1486 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-06-23 20:01:40 +00:00
parent e24c8dea5b
commit 1c9bd201ec
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,6 @@
#include <config.h> #include <config.h>
#endif #endif
#include <assert.h>
#include <sys/soundcard.h> #include <sys/soundcard.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <stdio.h> #include <stdio.h>
@ -40,6 +39,7 @@
#include <pulsecore/core-error.h> #include <pulsecore/core-error.h>
#include <pulsecore/core-util.h> #include <pulsecore/core-util.h>
#include <pulsecore/log.h> #include <pulsecore/log.h>
#include <pulsecore/macro.h>
#include "oss-util.h" #include "oss-util.h"
@ -47,24 +47,23 @@ int pa_oss_open(const char *device, int *mode, int* pcaps) {
int fd = -1; int fd = -1;
int caps; int caps;
assert(device && mode && (*mode == O_RDWR || *mode == O_RDONLY || *mode == O_WRONLY)); pa_assert(device);
pa_assert(mode);
pa_assert(*mode == O_RDWR || *mode == O_RDONLY || *mode == O_WRONLY);
if(!pcaps) if(!pcaps)
pcaps = &caps; pcaps = &caps;
if (*mode == O_RDWR) { if (*mode == O_RDWR) {
if ((fd = open(device, O_RDWR|O_NDELAY)) >= 0) { if ((fd = open(device, O_RDWR|O_NDELAY|O_NOCTTY)) >= 0) {
int dcaps, *tcaps;
ioctl(fd, SNDCTL_DSP_SETDUPLEX, 0); ioctl(fd, SNDCTL_DSP_SETDUPLEX, 0);
tcaps = pcaps ? pcaps : &dcaps; if (ioctl(fd, SNDCTL_DSP_GETCAPS, pcaps) < 0) {
if (ioctl(fd, SNDCTL_DSP_GETCAPS, tcaps) < 0) {
pa_log("SNDCTL_DSP_GETCAPS: %s", pa_cstrerror(errno)); pa_log("SNDCTL_DSP_GETCAPS: %s", pa_cstrerror(errno));
goto fail; goto fail;
} }
if (*tcaps & DSP_CAP_DUPLEX) if (*pcaps & DSP_CAP_DUPLEX)
goto success; goto success;
pa_log_warn("'%s' doesn't support full duplex", device); pa_log_warn("'%s' doesn't support full duplex", device);
@ -72,21 +71,19 @@ int pa_oss_open(const char *device, int *mode, int* pcaps) {
close(fd); close(fd);
} }
if ((fd = open(device, (*mode = O_WRONLY)|O_NDELAY)) < 0) { if ((fd = open(device, (*mode = O_WRONLY)|O_NDELAY|O_NOCTTY)) < 0) {
if ((fd = open(device, (*mode = O_RDONLY)|O_NDELAY)) < 0) { if ((fd = open(device, (*mode = O_RDONLY)|O_NDELAY|O_NOCTTY)) < 0) {
pa_log("open('%s'): %s", device, pa_cstrerror(errno)); pa_log("open('%s'): %s", device, pa_cstrerror(errno));
goto fail; goto fail;
} }
} }
} else { } else {
if ((fd = open(device, *mode|O_NDELAY)) < 0) { if ((fd = open(device, *mode|O_NDELAY|O_NOCTTY)) < 0) {
pa_log("open('%s'): %s", device, pa_cstrerror(errno)); pa_log("open('%s'): %s", device, pa_cstrerror(errno));
goto fail; goto fail;
} }
} }
success:
*pcaps = 0; *pcaps = 0;
if (ioctl(fd, SNDCTL_DSP_GETCAPS, pcaps) < 0) { if (ioctl(fd, SNDCTL_DSP_GETCAPS, pcaps) < 0) {
@ -94,6 +91,8 @@ success:
goto fail; goto fail;
} }
success:
pa_log_debug("capabilities:%s%s%s%s%s%s%s%s%s%s%s%s%s%s", pa_log_debug("capabilities:%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
*pcaps & DSP_CAP_BATCH ? " BATCH" : "", *pcaps & DSP_CAP_BATCH ? " BATCH" : "",
#ifdef DSP_CAP_BIND #ifdef DSP_CAP_BIND
@ -166,7 +165,8 @@ int pa_oss_auto_format(int fd, pa_sample_spec *ss) {
[PA_SAMPLE_FLOAT32BE] = AFMT_QUERY, /* not supported */ [PA_SAMPLE_FLOAT32BE] = AFMT_QUERY, /* not supported */
}; };
assert(fd >= 0 && ss); pa_assert(fd >= 0);
pa_assert(ss);
orig_format = ss->format; orig_format = ss->format;
@ -199,7 +199,7 @@ int pa_oss_auto_format(int fd, pa_sample_spec *ss) {
pa_log("SNDCTL_DSP_CHANNELS: %s", pa_cstrerror(errno)); pa_log("SNDCTL_DSP_CHANNELS: %s", pa_cstrerror(errno));
return -1; return -1;
} }
assert(channels > 0); pa_assert(channels > 0);
if (ss->channels != channels) { if (ss->channels != channels) {
pa_log_warn("device doesn't support %i channels, using %i channels.", ss->channels, channels); pa_log_warn("device doesn't support %i channels, using %i channels.", ss->channels, channels);
@ -211,7 +211,7 @@ int pa_oss_auto_format(int fd, pa_sample_spec *ss) {
pa_log("SNDCTL_DSP_SPEED: %s", pa_cstrerror(errno)); pa_log("SNDCTL_DSP_SPEED: %s", pa_cstrerror(errno));
return -1; return -1;
} }
assert(speed > 0); pa_assert(speed > 0);
if (ss->rate != (unsigned) speed) { if (ss->rate != (unsigned) speed) {
pa_log_warn("device doesn't support %i Hz, changed to %i Hz.", ss->rate, speed); pa_log_warn("device doesn't support %i Hz, changed to %i Hz.", ss->rate, speed);
@ -252,9 +252,9 @@ static int pa_oss_get_volume(int fd, int mixer, const pa_sample_spec *ss, pa_cvo
char cv[PA_CVOLUME_SNPRINT_MAX]; char cv[PA_CVOLUME_SNPRINT_MAX];
unsigned vol; unsigned vol;
assert(fd >= 0); pa_assert(fd >= 0);
assert(ss); pa_assert(ss);
assert(volume); pa_assert(volume);
if (ioctl(fd, mixer, &vol) < 0) if (ioctl(fd, mixer, &vol) < 0)
return -1; return -1;
@ -357,7 +357,7 @@ int pa_oss_get_hw_description(const char *dev, char *name, size_t l) {
if (device == n) { if (device == n) {
char *k = strchr(line, ':'); char *k = strchr(line, ':');
assert(k); pa_assert(k);
k++; k++;
k += strspn(k, " "); k += strspn(k, " ");