[patch] alsa-utils-0.9.0_rc8-aplay.diff

alsa-utils-0.9.0_rc8-aplay.diff (text/plain), 1.60 KB, created by J. Ellis (RETIRED) on 2003-03-23 04:04:30 UTC

--- /var/tmp/portage/alsa-utils-0.9.0_rc8-r2/work/alsa-utils-0.9.0rc8a/aplay/aplay.c	2003-02-24 22:51:16.000000000 +0900
+++ aplay.c	2003-03-22 16:17:14.000000000 +0900
@@ -203,6 +203,7 @@
 			snd_ctl_close(handle);
 			continue;
 		}
+		fprintf(stderr, "**** List of %s Hardware Devices ****\n", snd_pcm_stream_name(stream));
 		dev = -1;
 		while (1) {
 			unsigned int count;
@@ -1526,6 +1527,10 @@
 	u_int tmp;
 	u_short tmp2;
 
+	/* WAVE cannot handle greater than 32bit (signed?) int */
+	if (cnt == (size_t)-2)
+		cnt = 0x7fffff00;
+
 	bits = 8;
 	switch ((unsigned long) hwparams.format) {
 	case SND_PCM_FORMAT_U8:
@@ -1753,28 +1758,29 @@
 
 void capture_go(int fd, size_t count, int rtype, char *name)
 {
-	size_t c;
+	size_t c, cur;
 	ssize_t r, err;
 
 	header(rtype, name);
 	set_params();
 
-	while (count > 0) {
-		c = count;
-		if (c > chunk_bytes)
-			c = chunk_bytes;
-		c = c * 8 / bits_per_frame;
-		if ((size_t)(r = pcm_read(audiobuf, c)) != c)
-			break;
-		r = r * bits_per_frame / 8;
-		if ((err = write(fd, audiobuf, r)) != r) {
-			perror(name);
-			exit(EXIT_FAILURE);
+	do {
+		for (cur = count; cur > 0; cur -= r) {
+			c = cur;
+			if (c > chunk_bytes)
+				c = chunk_bytes;
+			c = c * 8 / bits_per_frame;
+			if ((size_t)(r = pcm_read(audiobuf, c)) != c)
+				break;
+			r = r * bits_per_frame / 8;
+			if ((err = write(fd, audiobuf, r)) != r) {
+				perror(name);
+				exit(EXIT_FAILURE);
+			}
+			if (err > 0)
+				fdcount += err;
 		}
-		if (err > 0)
-			fdcount += err;
-		count -= r;
-	}
+	} while (rtype == FORMAT_RAW && !timelimit);
 }
 
 /*
@@ -2052,3 +2058,4 @@
 	if (ret)
 		exit(ret);
 }
+