X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=5db5e1749a5d915dc3f55f956c423399613da7bf;hp=a24bf20c9319a5233bd71cfcc299444a81732805;hb=f393aab6b6e8c7413c02b4e198666ad95570066c;hpb=6b935f552ebfe3a0a83ec9367deb2f42c1aff252

diff --git a/error.h b/error.h
index a24bf20c..5db5e174 100644
--- a/error.h
+++ b/error.h
@@ -36,16 +36,39 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define FILE_WRITE_ERRORS
 #define STDIN_ERRORS
 
-
 extern const char **para_errlist[];
 
+#define OGG_AFH_COMMON_ERRORS \
+	PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error (first packet)"), \
+	PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \
+	PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \
+	PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \
+	PARA_ERROR(OGG_EMPTY, "no ogg pages found"), \
+
+
+#define SPX_AFH_ERRORS \
+	PARA_ERROR(SPX_COMMENT, "invalid speex comment"), \
+
+
+#define SPX_COMMON_ERRORS \
+	PARA_ERROR(SPX_HEADER, "can not read speex header"), \
+	PARA_ERROR(SPX_HEADER_MODE, "invalid speex mode in header"), \
+	PARA_ERROR(SPX_VERSION, "incompatible speex bit stream version"), \
+	PARA_ERROR(SPX_DECODER_INIT, "speex decoder initialization failed"), \
+	PARA_ERROR(SPX_CTL_BAD_RQ, "speex_decoder_ctl: invalid request"), \
+	PARA_ERROR(SPX_CTL_INVAL, "speex_decoder_ctl: invalid argument"), \
+
+#define SPXDEC_FILTER_ERRORS \
+	PARA_ERROR(SPX_DECODE, "speex decoding error"), \
+	PARA_ERROR(SPX_DECODE_OVERFLOW, "speex decoding overflow"), \
+	PARA_ERROR(SPX_EOS, "speex: end of stream"), \
+
 #define BUFFER_TREE_ERRORS \
 	PARA_ERROR(BTR_EOF, "buffer tree: end of file"), \
 	PARA_ERROR(BTR_NO_CHILD, "btr node has no children"), \
 	PARA_ERROR(BTR_NAVAIL, "btr node: value currently unavailable"), \
 
 
-
 #define BITSTREAM_ERRORS \
 	PARA_ERROR(VLC, "invalid vlc code"), \
 
@@ -326,12 +349,7 @@ extern const char **para_errlist[];
 
 
 #define OGG_AFH_ERRORS \
-	PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \
-	PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \
-	PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error (first packet)"), \
 	PARA_ERROR(VORBIS, "vorbis synthesis header-in error (not vorbis?)"), \
-	PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \
-	PARA_ERROR(OGG_EMPTY, "no ogg pages found"), \
 
 
 #define VSS_ERRORS \