X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=287e3c7a905bddd73b0cfda92e2653292ff93ab8;hp=454d736a1d565e4ef84fc0226f748ca41fa4a256;hb=67900f49834e42887225eaf586a1d235ed11910a;hpb=684ea7f70948c9ce5077a8a6460946ff86fefe46

diff --git a/para.h b/para.h
index 454d736a..287e3c7a 100644
--- a/para.h
+++ b/para.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -134,7 +134,7 @@
 /** Version text used by various commands if -V switch was given. */
 #define VERSION_TEXT(prefix) "para_" prefix " " PACKAGE_VERSION \
 	" (" GIT_VERSION ": " CODENAME ")" "\n" \
-	"Copyright (C) 2009 Andre Noll\n" \
+	"Copyright (C) 2010 Andre Noll\n" \
 	"This is free software with ABSOLUTELY NO WARRANTY." \
 	" See COPYING for details.\n" \
 	"Written by Andre Noll.\n" \
@@ -255,3 +255,31 @@ _static_inline_ long int para_random(unsigned max)
 #define FEC_EOF_PACKET "\xec\x0d\xcc\xfe\0\0\0\0" \
 	"\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0"
 #define FEC_EOF_PACKET_LEN 32
+
+/** Used to avoid a shortcoming in vim's syntax highlighting. */
+#define EMBRACE(...) { __VA_ARGS__}
+
+/**
+ * The sample formats supported by paraslash.
+ *
+ * It may be determined by one of the following sources:
+ *
+ *	1. The decoding filter (para_audiod only). In this case, it is always
+ *	\t SF_S16_LE which is the canonical format used within decoders.
+ *
+ *	2. The wav header (para_write only).
+ *
+ *	3. The --format option of para_write.
+ */
+#define SAMPLE_FORMATS \
+	SAMPLE_FORMAT(SF_S8, "8 bit signed"), \
+	SAMPLE_FORMAT(SF_U8, "8 bit unsigned"), \
+	SAMPLE_FORMAT(SF_S16_LE, "16 bit signed, little endian"), \
+	SAMPLE_FORMAT(SF_S16_BE, "16 bit signed, big endian"), \
+	SAMPLE_FORMAT(SF_U16_LE, "16 bit unsigned, little endian"), \
+	SAMPLE_FORMAT(SF_U16_BE, "16 bit unsigned, big endian"), \
+
+#define SAMPLE_FORMAT(a, b) a
+enum sample_format {SAMPLE_FORMATS};
+#undef SAMPLE_FORMAT
+#define SAMPLE_FORMAT(a, b) b