aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authormalc <av1474@comtv.ru>2010-01-09 18:06:54 +0300
committermalc <av1474@comtv.ru>2010-01-09 18:07:36 +0300
commit3d709fe73a77c40e263b3af6e650fd4b519c3562 (patch)
tree5eaca674b86d154db936fe6a4554d918362ad21f /audio
parent6d246526ce3c145b2831285def6983f5de6190d3 (diff)
downloadqemu-3d709fe73a77c40e263b3af6e650fd4b519c3562.zip
qemu-3d709fe73a77c40e263b3af6e650fd4b519c3562.tar.gz
qemu-3d709fe73a77c40e263b3af6e650fd4b519c3562.tar.bz2
oss: fix fragment setting
Previous patch introduced subtle regression, in cases when OSS_GETVERSION fails the code wasn't falling back to SNDCTL_DSP_SETFRAGMENT. Signed-off-by: malc <av1474@comtv.ru>
Diffstat (limited to 'audio')
-rw-r--r--audio/ossaudio.c29
1 files changed, 16 insertions, 13 deletions
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 79d1daa..ebf8b23 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -247,6 +247,7 @@ static int oss_open (int in, struct oss_params *req,
int oflags = conf.exclusive ? O_EXCL : 0;
audio_buf_info abinfo;
int fmt, freq, nchannels;
+ int setfragment = 1;
const char *dspname = in ? conf.devpath_in : conf.devpath_out;
const char *typ = in ? "ADC" : "DAC";
@@ -290,25 +291,27 @@ static int oss_open (int in, struct oss_params *req,
if (ioctl (fd, OSS_GETVERSION, &version)) {
oss_logerr2 (errno, typ, "Failed to get OSS version\n");
- version = 0;
- }
-
- if (conf.debug) {
- dolog ("OSS version = %#x\n", version);
}
+ else {
+ if (conf.debug) {
+ dolog ("OSS version = %#x\n", version);
+ }
- if (version >= 0x040000) {
- int policy = conf.policy;
- if (ioctl (fd, SNDCTL_DSP_POLICY, &policy)) {
- oss_logerr2 (errno, typ, "Failed to set timing policy to %d\n",
- conf.policy);
- goto err;
+ if (version >= 0x040000) {
+ int policy = conf.policy;
+ if (ioctl (fd, SNDCTL_DSP_POLICY, &policy)) {
+ oss_logerr2 (errno, typ,
+ "Failed to set timing policy to %d\n",
+ conf.policy);
+ goto err;
+ }
+ setfragment = 0;
}
}
}
- else
#endif
- {
+
+ if (setfragment) {
int mmmmssss = (req->nfrags << 16) | ctz32 (req->fragsize);
if (ioctl (fd, SNDCTL_DSP_SETFRAGMENT, &mmmmssss)) {
oss_logerr2 (errno, typ, "Failed to set buffer length (%d, %d)\n",