X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=5a2e39b468fa58d7cb66bc3ca07f71012b02c2e2;hp=31903062ab7be0f30d2939cb088d9da45989dd85;hb=25518356767bd60bd03ac2f9c6b2381644483925;hpb=840725e10602abd8187428924040f4bf3e04594c

diff --git a/error.h b/error.h
index 31903062..5a2e39b4 100644
--- a/error.h
+++ b/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -16,7 +16,6 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define TIME_ERRORS
 #define CLOSE_ON_FORK_ERRORS
 #define DAEMON_ERRORS
-#define UDP_SEND_ERRORS
 #define GUI_ERRORS
 #define RINGBUFFER_ERRORS
 #define SCORE_ERRORS
@@ -35,17 +34,41 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define AUDIOD_COMMAND_LIST_ERRORS
 #define STDOUT_ERRORS
 #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"), \
 
@@ -196,9 +219,6 @@ extern const char **para_errlist[];
 
 #define AUDIOC_ERRORS \
 	PARA_ERROR(AUDIOC_SYNTAX, "audioc syntax error"), \
-	PARA_ERROR(AUDIOC_READ, "audioc read error"), \
-	PARA_ERROR(AUDIOC_WRITE, "audioc write error"), \
-	PARA_ERROR(AUDIOC_OVERRUN, "audioc buffer overrun"), \
 
 
 #define CLIENT_COMMON_ERRORS \
@@ -216,18 +236,14 @@ extern const char **para_errlist[];
 	PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \
 
 
-#define STDIN_ERRORS \
-	PARA_ERROR(STDIN_EOF, "end of file"), \
-
-
-
 #define NET_ERRORS \
 	PARA_ERROR(NAME_TOO_LONG, "name too long for struct sockaddr_un"), \
-	PARA_ERROR(ADDRESS_LOOKUP, "address lookup / socket creation failed"), \
+	PARA_ERROR(ADDRESS_LOOKUP, "can not resolve requested address"),\
 	PARA_ERROR(CHMOD, "failed to set socket mode"), \
 	PARA_ERROR(SENDMSG, "sendmsg() failed"), \
 	PARA_ERROR(RECVMSG, "recvmsg() failed"), \
 	PARA_ERROR(SCM_CREDENTIALS, "did not receive SCM credentials"), \
+	PARA_ERROR(MAKESOCK, "makesock error"), \
 
 
 #define UDP_RECV_ERRORS \
@@ -235,6 +251,11 @@ extern const char **para_errlist[];
 	PARA_ERROR(UDP_OVERRUN, "output buffer overrun"), \
 
 
+#define UDP_SEND_ERRORS \
+	PARA_ERROR(TARGET_EXISTS, "requested target is already present"),\
+	PARA_ERROR(TARGET_NOT_FOUND, "requested target not found")
+
+
 #define HTTP_RECV_ERRORS \
 	PARA_ERROR(HTTP_RECV_OVERRUN, "http_recv: output buffer overrun"), \
 
@@ -278,7 +299,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(OGGDEC_BADHEADER, "invalid vorbis bitstream header"), \
 	PARA_ERROR(OGGDEC_FAULT, "bug or heap/stack corruption"), \
 	PARA_ERROR(OGGDEC_BADLINK, "invalid stream section or requested link corrupt"), \
-	PARA_ERROR(OGGDEC_SYNTAX, "syntax error in oggdec config"), \
 
 
 #define GRAB_CLIENT_ERRORS \
@@ -330,12 +350,9 @@ 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"), \
+	PARA_ERROR(OGG_PACKET_IN, "ogg_stream_packetin() failed"), \
+	PARA_ERROR(OGG_STREAM_FLUSH, "ogg_stream_flush() failed"), \
 
 
 #define VSS_ERRORS \