diff --git a/usr.bin/audio/ctl/ctl.c b/usr.bin/audio/ctl/ctl.c index f5ca39b1b2c9..6f102f5cad5d 100644 --- a/usr.bin/audio/ctl/ctl.c +++ b/usr.bin/audio/ctl/ctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: ctl.c,v 1.26 2001/02/19 23:03:43 cgd Exp $ */ +/* $NetBSD: ctl.c,v 1.27 2001/03/28 03:18:39 simonb Exp $ */ /* * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -312,7 +312,7 @@ getinfo(fd) if (pos >= sizeof(encbuf)-1) break; pos += snprintf(encbuf+pos, sizeof(encbuf)-pos, "%s:%d%s", - enc.name, enc.precision, + enc.name, enc.precision, enc.flags & AUDIO_ENCODINGFLAG_EMULATED ? "*" : ""); } if (ioctl(fd, AUDIO_GETFD, &fullduplex) < 0) @@ -346,11 +346,11 @@ main(argc, argv) struct stat dstat, ostat; const char *file; char *sep = "="; - + file = getenv("AUDIOCTLDEVICE"); if (file == 0) file = _PATH_AUDIOCTL; - + while ((ch = getopt(argc, argv, "af:nw")) != -1) { switch(ch) { case 'a': @@ -372,7 +372,7 @@ main(argc, argv) } argc -= optind; argv += optind; - + fd = open(file, O_WRONLY); if (fd < 0) fd = open(file, O_RDONLY); @@ -387,7 +387,7 @@ main(argc, argv) #endif if (fd < 0) err(1, "%s", file); - + /* Check if stdout is the same device as the audio device. */ if (fstat(fd, &dstat) < 0) err(1, "fstat audioctl"); diff --git a/usr.bin/audio/play/play.c b/usr.bin/audio/play/play.c index 0d51cc477802..aadf182a5a04 100644 --- a/usr.bin/audio/play/play.c +++ b/usr.bin/audio/play/play.c @@ -1,4 +1,4 @@ -/* $NetBSD: play.c,v 1.24 2001/03/08 06:28:14 ross Exp $ */ +/* $NetBSD: play.c,v 1.25 2001/03/28 03:18:39 simonb Exp $ */ /* * Copyright (c) 1999 Matthew R. Green @@ -272,8 +272,8 @@ play(file) err(1, "munmap failed"); close(fd); - } + /* * play the file on on the file descriptor fd */ @@ -328,7 +328,7 @@ play_fd(file, fd) } if (write(audiofd, buffer, datainbuf) != datainbuf) err(1, "write failed"); - + datasize -= datainbuf; datainbuf = 0; } @@ -357,7 +357,7 @@ audioctl_write_fromhdr(hdr, fsz, fd, datasize) AUDIO_INITINFO(&info); sunhdr = hdr; if (ntohl(sunhdr->magic) == AUDIO_FILE_MAGIC) { - if (audio_sun_to_encoding(ntohl(sunhdr->encoding), + if (audio_sun_to_encoding(ntohl(sunhdr->encoding), &info.play.encoding, &info.play.precision)) { if (!qflag) warnx("unknown unsupported Sun audio encoding" @@ -369,9 +369,9 @@ audioctl_write_fromhdr(hdr, fsz, fd, datasize) info.play.sample_rate = ntohl(sunhdr->sample_rate); info.play.channels = ntohl(sunhdr->channels); - hdr_len = ntohl(sunhdr->hdr_size); + hdr_len = ntohl(sunhdr->hdr_size); - *datasize = ntohl(sunhdr->data_size); + *datasize = ntohl(sunhdr->data_size); goto set_audio_mode; } @@ -419,7 +419,7 @@ set_audio_mode: if (ioctl(fd, AUDIO_SETINFO, &info) < 0) err(1, "failed to set audio info"); - + return (hdr_len); }