CVS commit: src/usr.bin/audio

[Jared D. McNeill]

Module Name:    src
Committed By:   jmcneill
Date:           Wed Dec 29 14:38:55 UTC 2010

Modified Files:
        src/usr.bin/audio/play: play.c
        src/usr.bin/audio/record: record.c

Log Message:
allow for buffer sizes < 32k


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/usr.bin/audio/play/play.c
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/audio/record/record.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/audio/play/play.c
diff -u src/usr.bin/audio/play/play.c:1.51 src/usr.bin/audio/play/play.c:1.52
--- src/usr.bin/audio/play/play.c:1.51	Wed Dec 29 13:09:03 2010
+++ src/usr.bin/audio/play/play.c	Wed Dec 29 14:38:54 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: play.c,v 1.51 2010/12/29 13:09:03 mrg Exp $	*/
+/*	$NetBSD: play.c,v 1.52 2010/12/29 14:38:54 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2001, 2002, 2010 Matthew R. Green
@@ -28,7 +28,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: play.c,v 1.51 2010/12/29 13:09:03 mrg Exp $");
+__RCSID("$NetBSD: play.c,v 1.52 2010/12/29 14:38:54 jmcneill Exp $");
 #endif
 
 
@@ -184,10 +184,11 @@
 
 	if (ioctl(audiofd, AUDIO_GETINFO, &info) < 0)
 		err(1, "failed to get audio info");
-	if (bufsize == 0)
+	if (bufsize == 0) {
 		bufsize = info.play.buffer_size;
-	if (bufsize < 32 * 1024)
-		bufsize = 32 * 1024;
+		if (bufsize < 32 * 1024)
+			bufsize = 32 * 1024;
+	}
 
 	signal(SIGINT, cleanup);
 	signal(SIGTERM, cleanup);

Index: src/usr.bin/audio/record/record.c
diff -u src/usr.bin/audio/record/record.c:1.48 src/usr.bin/audio/record/record.c:1.49
--- src/usr.bin/audio/record/record.c:1.48	Wed Dec 29 13:09:03 2010
+++ src/usr.bin/audio/record/record.c	Wed Dec 29 14:38:55 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: record.c,v 1.48 2010/12/29 13:09:03 mrg Exp $	*/
+/*	$NetBSD: record.c,v 1.49 2010/12/29 14:38:55 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 1999, 2002, 2003, 2005, 2010 Matthew R. Green
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: record.c,v 1.48 2010/12/29 13:09:03 mrg Exp $");
+__RCSID("$NetBSD: record.c,v 1.49 2010/12/29 14:38:55 jmcneill Exp $");
 #endif
 
 
@@ -246,10 +246,11 @@
 	 */
 	if (ioctl(audiofd, AUDIO_GETINFO, &oinfo) < 0)
 		err(1, "failed to get audio info");
-	if (bufsize == 0)
+	if (bufsize == 0) {
 		bufsize = oinfo.record.buffer_size;
-	if (bufsize < 32 * 1024)
-		bufsize = 32 * 1024;
+		if (bufsize < 32 * 1024)
+			bufsize = 32 * 1024;
+	}
 	omonitor_gain = oinfo.monitor_gain;
 
 	buffer = malloc(bufsize);