X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=4ec9da859752bb7d9b3328bd9b5ef86b1c47d855;hb=80dba626e7eddcaa9059e37afef95ad01967d833;hp=24f2a11378439c6f524aca7601945e16eb44c249;hpb=eea9d1cae30df921ae2fd1771518b8b21dbd0daf;p=paraslash.git

diff --git a/error.h b/error.h
index 24f2a113..4ec9da85 100644
--- a/error.h
+++ b/error.h
@@ -13,7 +13,6 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 
 /* these do not need error handling (yet) */
 #define SERVER_ERRORS
-#define WAV_FILTER_ERRORS
 #define TIME_ERRORS
 #define CLOSE_ON_FORK_ERRORS
 #define DAEMON_ERRORS
@@ -30,13 +29,28 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define HTTP_SEND_ERRORS
 #define GGO_ERRORS
 #define COLOR_ERRORS
+#define SIGNAL_ERRORS
+
 
 extern const char **para_errlist[];
 
+#define PREBUFFER_FILTER_ERRORS \
+	PARA_ERROR(PREBUFFER_SYNTAX, "syntax error in prebuffer filter config"), \
+
+#define OSS_WRITE_ERRORS \
+	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"), \
+
+
 #define COMPRESS_FILTER_ERRORS \
 	PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \
 
 
+#define WAV_FILTER_ERRORS \
+	PARA_ERROR(WAV_BAD_FC, "invalid filter chain configuration"), \
+
+
 #define FEC_ERRORS \
 	PARA_ERROR(FEC_BAD_IDX, "invalid index vector"), \
 	PARA_ERROR(FEC_SINGULAR, "unexpected singular matrix"), \
@@ -46,7 +60,7 @@ extern const char **para_errlist[];
 
 #define FECDEC_FILTER_ERRORS \
 	PARA_ERROR(BAD_FEC_HEADER, "invalid fec header"), \
-	PARA_ERROR(BAD_SLICE_SIZE, "slice size too large"), \
+	PARA_ERROR(BAD_SLICE_SIZE, "slice size zero or too large"), \
 	PARA_ERROR(BAD_SLICE_NUM, "invalid slice number"), \
 	PARA_ERROR(FECDEC_OVERRUN, "fecdec output buffer overrun"), \
 	PARA_ERROR(FECDEC_EOF, "received eof packet"), \
@@ -138,7 +152,6 @@ extern const char **para_errlist[];
 #define MOOD_ERRORS \
 	PARA_ERROR(MOOD_SYNTAX, "mood syntax error"), \
 	PARA_ERROR(NO_MOOD, "no mood available"), \
-	PARA_ERROR(NOT_ADMISSIBLE, "file is not admissible"), \
 	PARA_ERROR(DUMMY_ROW, "attempted to access blob dummy object"), \
 
 
@@ -296,10 +309,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(FILTER_SYNTAX, "syntax error"), \
 
 
-#define SIGNAL_ERRORS \
-	PARA_ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR"), \
-
-
 #define STRING_ERRORS \
 	PARA_ERROR(ATOI_OVERFLOW, "value too large"), \
 	PARA_ERROR(STRTOLL, "unknown strtoll error"), \
@@ -331,19 +340,17 @@ extern const char **para_errlist[];
 
 
 #define OGG_AFH_ERRORS \
-	PARA_ERROR(OGG_READ, "ogg read error"), \
 	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_INFO, "ov_info error"), \
-	PARA_ERROR(OGG_VERSION, "unsupported ogg version"), \
-	PARA_ERROR(OGG_BAD_HEADER, "invalid ogg vorbis header"), \
-	PARA_ERROR(OGG_UNKNOWN_ERROR, "unknown ogg vorbis error"), \
+	PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \
+	PARA_ERROR(OGG_EMPTY, "no ogg pages found"), \
 
 
 #define VSS_ERRORS \
 	PARA_ERROR(NOFD, "did not receive open fd from afs"), \
+	PARA_ERROR(BAD_CT, "invalid chunk table or bad FEC configuration")
 
 
 #define CRYPT_ERRORS \
@@ -392,7 +399,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \
 	PARA_ERROR(ALSA_WRITE, "alsa write error"), \
 	PARA_ERROR(PCM_OPEN, "unable to open pcm"), \
-	PARA_ERROR(SND_PCM_INFO, "pcm info error"), \
+	PARA_ERROR(PHYSICAL_WIDTH, "unable to determine bytes per frame"), \
 	PARA_ERROR(GET_BUFFER_TIME, "snd_pcm_hw_params_get_buffer_time_max() failed"), \
 	PARA_ERROR(SET_BUFFER_TIME, "snd_pcm_hw_params_set_buffer_time_near() failed"), \
 	PARA_ERROR(SET_RATE, "snd_pcm_hw_params_set_rate_near failed"), \