Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-4]: src/usr.bin/audio/common pull up rev 1.9 from trunk (reques...
details: https://anonhg.NetBSD.org/src/rev/4be75b1b29b4
branches: netbsd-1-4
changeset: 469512:4be75b1b29b4
user: cgd <cgd%NetBSD.org@localhost>
date: Mon Sep 27 05:26:24 1999 +0000
description:
pull up rev 1.9 from trunk (requested by mrg):
Fix an off-by-one error in the error message array.
diffstat:
usr.bin/audio/common/audio.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diffs (39 lines):
diff -r 990c3ff0fdfd -r 4be75b1b29b4 usr.bin/audio/common/audio.c
--- a/usr.bin/audio/common/audio.c Mon Sep 27 05:08:49 1999 +0000
+++ b/usr.bin/audio/common/audio.c Mon Sep 27 05:26:24 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.7 1999/03/30 14:46:23 mrg Exp $ */
+/* $NetBSD: audio.c,v 1.7.2.1 1999/09/27 05:26:24 cgd Exp $ */
/*
* Copyright (c) 1999 Matthew R. Green
@@ -115,6 +115,11 @@
{ AUDIO_FILE_ENCODING_LINEAR_24, AUDIO_ENCODING_ULINEAR_BE, 24 },
{ AUDIO_FILE_ENCODING_LINEAR_32, AUDIO_ENCODING_ULINEAR_BE, 32 },
#if 0
+ /*
+ * we should make some of these available. the, eg ultrasparc, port
+ * can use the VIS instructions (if available) do do some of these
+ * mpeg ones.
+ */
{ AUDIO_FILE_ENCODING_FLOAT, AUDIO_ENCODING_ULAW, 32 },
{ AUDIO_FILE_ENCODING_DOUBLE, AUDIO_ENCODING_ULAW, 64 },
{ AUDIO_FILE_ENCODING_ADPCM_G721, AUDIO_ENCODING_ULAW, 4 },
@@ -351,11 +356,12 @@
}
const char *const audio_errlist[] = {
- "no audio entry",
- "short header",
- "unsupported WAV format",
- "bad (unsupported) WAV PCM format",
- "no WAV audio data",
+ "error zero", /* nothing? */
+ "no audio entry", /* AUDIO_ENOENT */
+ "short header", /* AUDIO_ESHORTHDR */
+ "unsupported WAV format", /* AUDIO_EWAVUNSUPP */
+ "bad (unsupported) WAV PCM format", /* AUDIO_EWAVBADPCM */
+ "no WAV audio data", /* AUDIO_EWAVNODATA */
};
const char *
Home |
Main Index |
Thread Index |
Old Index