diff options
Diffstat (limited to 'audio/play/files/patch-encode__riff.c')
-rw-r--r-- | audio/play/files/patch-encode__riff.c | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/audio/play/files/patch-encode__riff.c b/audio/play/files/patch-encode__riff.c deleted file mode 100644 index 9965314a2953..000000000000 --- a/audio/play/files/patch-encode__riff.c +++ /dev/null @@ -1,54 +0,0 @@ ---- encode_riff.c.orig 1997-03-25 15:25:07 UTC -+++ encode_riff.c -@@ -11,7 +11,7 @@ static char rcsid[] = - #include <signal.h> - #include <err.h> - --#include <machine/soundcard.h> -+#include <sys/soundcard.h> - - #include "play.h" - #include "encode_riff.h" -@@ -74,7 +74,7 @@ int play_riff(char *audio_file, riff_hea - char *bufp; - char *device; - int devfd, filefd; -- int stat, len, buf_size, format, data_length; -+ int stat, len, buf_size, format = 0, data_length; - - if (!f_hasdsp) { - fprintf(stderr, "%s: %s: needs DSP for play\n", myname, audio_file); -@@ -109,7 +109,12 @@ int play_riff(char *audio_file, riff_hea - warn("%s", device); - stat = FAIL; goto failplay0; - } -+#if 0 -+ /* this (at least under fbsd) means that you want to set play format -+ * to headerp->sample_size which is a nonsense */ - if (ioctl(devfd, SNDCTL_DSP_SAMPLESIZE, &headerp->sample_size) < 0) { -+#endif -+ if (ioctl(devfd, SNDCTL_DSP_SAMPLESIZE, &format) < 0) { - warn("%s", device); - stat = FAIL; goto failplay0; - } -@@ -121,11 +126,6 @@ int play_riff(char *audio_file, riff_hea - warn("%s", device); - stat = FAIL; goto failplay0; - } -- /* XXX */ -- if (ioctl(devfd, SNDCTL_DSP_SETFMT, &format) < 0) { -- warn("%s", device); -- stat = FAIL; goto failplay0; -- } - if (headerp->channels > 1) { - int ch = headerp->channels; - if (ioctl(devfd, SNDCTL_DSP_STEREO, &ch) < 0) { -@@ -163,6 +163,8 @@ int play_riff(char *audio_file, riff_hea - warn("read"); - stat = FAIL; goto failplay2; - } -+/* printf("len = %10d, len = %10d\n", stat, len); */ -+ stat = (len < stat)? len : stat; - if (write(devfd, bufp, stat) < 0) { - warn("write"); - stat = FAIL; goto failplay2; |