Module Name: src
Committed By: nia
Date: Sat Dec 19 12:55:28 UTC 2020
Modified Files:
src/lib/libossaudio: ossaudio.c
Log Message:
ossaudio(3): Do not reuse results from AUDIO_GETBUFINFO in SETINFO
Should help PR 55876.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/lib/libossaudio/ossaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.64 src/lib/libossaudio/ossaudio.c:1.65
--- src/lib/libossaudio/ossaudio.c:1.64 Fri Nov 13 09:02:39 2020
+++ src/lib/libossaudio/ossaudio.c Sat Dec 19 12:55:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.64 2020/11/13 09:02:39 nia Exp $ */
+/* $NetBSD: ossaudio.c,v 1.65 2020/12/19 12:55:28 nia Exp $ */
/*-
* Copyright (c) 1997, 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: ossaudio.c,v 1.64 2020/11/13 09:02:39 nia Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.65 2020/12/19 12:55:28 nia Exp $");
/*
* This is an Open Sound System compatibility layer, which provides
@@ -183,7 +183,6 @@ audio_ioctl(int fd, unsigned long com, v
/* This call is merely advisory, and may be a nop. */
break;
case SNDCTL_DSP_SPEED:
- AUDIO_INITINFO(&tmpinfo);
/*
* In Solaris, 0 is used a special value to query the
* current rate. This seems useful to support.
@@ -208,6 +207,7 @@ audio_ioctl(int fd, unsigned long com, v
INTARG = 1000;
if (INTARG > 192000)
INTARG = 192000;
+ AUDIO_INITINFO(&tmpinfo);
tmpinfo.play.sample_rate =
tmpinfo.record.sample_rate = INTARG;
retval = ioctl(fd, AUDIO_SETINFO, &tmpinfo);
