X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=564f1339dd9b51e4d0c4fc034c65d2aa6a7c6187;hp=5b1ce07726d619f32276ab750443aa3db81059e9;hb=e7593d7c153bfca2131b18621fb24ae18c1c0cb3;hpb=063328d833daa7e06589645e05d4d2e02f55e911

diff --git a/error.h b/error.h
index 5b1ce077..564f1339 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.
  */
@@ -19,7 +19,6 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define GUI_ERRORS
 #define RINGBUFFER_ERRORS
 #define SCORE_ERRORS
-#define SHA1_ERRORS
 #define RBTREE_ERRORS
 #define RECV_ERRORS
 #define IPC_ERRORS
@@ -46,6 +45,23 @@ extern const char **para_errlist[];
 	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"), \
@@ -86,7 +102,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(BAD_SAMPLE_FORMAT, "sample format not supported"), \
 	PARA_ERROR(BAD_CHANNEL_COUNT, "channel count not supported"), \
 	PARA_ERROR(BAD_SAMPLERATE, "sample rate not supported"), \
-	PARA_ERROR(OSS_EOF, "oss: end of file"), \
 
 
 #define COMPRESS_FILTER_ERRORS \
@@ -213,10 +228,8 @@ extern const char **para_errlist[];
 
 
 #define SCHED_ERRORS \
-	PARA_ERROR(TASK_KILLED, "task killed"), \
-	PARA_ERROR(TASK_UNREGISTERED, "task has been unscheduled"), \
-	PARA_ERROR(NO_SUCH_TASK, "task not found"), \
 	PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \
+	PARA_ERROR(SCHED_SHUTDOWN, "scheduler was shut down"), \
 
 
 #define NET_ERRORS \
@@ -226,6 +239,7 @@ extern const char **para_errlist[];
 	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 \
@@ -333,6 +347,8 @@ extern const char **para_errlist[];
 
 #define OGG_AFH_ERRORS \
 	PARA_ERROR(VORBIS, "vorbis synthesis header-in error (not vorbis?)"), \
+	PARA_ERROR(OGG_PACKET_IN, "ogg_stream_packetin() failed"), \
+	PARA_ERROR(OGG_STREAM_FLUSH, "ogg_stream_flush() failed"), \
 
 
 #define VSS_ERRORS \
@@ -394,12 +410,11 @@ extern const char **para_errlist[];
 	PARA_ERROR(SET_RATE, "snd_pcm_hw_params_set_rate_near failed"), \
 	PARA_ERROR(START_THRESHOLD, "snd_pcm_sw_params_set_start_threshold() failed"), \
 	PARA_ERROR(STOP_THRESHOLD, "snd_pcm_sw_params_set_stop_threshold() failed"), \
-	PARA_ERROR(ALSA_EOF, "alsa: end of file"), \
-
 
 
 #define WRITE_COMMON_ERRORS \
 	PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \
+	PARA_ERROR(WRITE_COMMON_EOF, "end of file"), \
 
 
 #define AACDEC_FILTER_ERRORS \