X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=755821068cabc9d33525cf28189b81015365974d;hp=c9031f8201695f49fa95dd9b9047228196d581a8;hb=05527588bd503e4748d801b641a9e3a6556525ad;hpb=4f01c486bb70a27f614cdc9c07a2b8d653db7605

diff --git a/error.h b/error.h
index c9031f82..75582106 100644
--- a/error.h
+++ b/error.h
@@ -30,13 +30,43 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define GGO_ERRORS
 #define COLOR_ERRORS
 #define SIGNAL_ERRORS
+#define FADE_ERRORS
+#define SERVER_COMMAND_LIST_ERRORS
+#define AFS_COMMAND_LIST_ERRORS
+#define AUDIOD_COMMAND_LIST_ERRORS
 
 
 extern const char **para_errlist[];
 
+#define BITSTREAM_ERRORS \
+	PARA_ERROR(VLC, "invalid vlc code"), \
+
+
+#define WMA_AFH_ERRORS \
+	PARA_ERROR(NO_WMA, "asf/wma format not recognized"), \
+
+
+#define WMA_COMMON_ERRORS \
+	PARA_ERROR(WMA_NO_GUID, "audio stream guid not found"), \
+	PARA_ERROR(WMA_BAD_ASF_HEADER, "invalid asf header"), \
+
+
+#define WMADEC_FILTER_ERRORS \
+	PARA_ERROR(WMA_BAD_PARAMS, "invalid WMA parameters"), \
+	PARA_ERROR(WMA_OUTPUT_SPACE, "insufficient output space"), \
+	PARA_ERROR(WMA_BAD_SUPERFRAME, "invalid superframe"), \
+	PARA_ERROR(WMA_BLOCK_SIZE, "invalid block size"), \
+	PARA_ERROR(INCOHERENT_BLOCK_LEN, "incoherent block length"), \
+
+
+#define IMDCT_ERRORS \
+	PARA_ERROR(FFT_BAD_PARAMS, "invalid params for fft"), \
+
+
 #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"), \
@@ -74,10 +104,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(MAX_CLIENTS, "maximal number of clients exceeded"), \
 
 
-#define FADE_ERRORS \
-	PARA_ERROR(FADE_SYNTAX, "fade syntax error"), \
-
-
 #define CLIENT_ERRORS \
 	PARA_ERROR(TASK_STARTED, "task started"), \
 
@@ -229,6 +255,8 @@ extern const char **para_errlist[];
 	PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \
 	PARA_ERROR(UCRED_PERM, "permission denied"), \
 	PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \
+	PARA_ERROR(TOO_MANY_CLIENTS, "maximal number of stat clients exceeded"), \
+	PARA_ERROR(UNKNOWN_STAT_ITEM, "status item not recognized"), \
 
 
 #define FILTER_COMMON_ERRORS \
@@ -238,8 +266,6 @@ extern const char **para_errlist[];
 
 
 #define STAT_ERRORS \
-	PARA_ERROR(TOO_MANY_CLIENTS, "maximal number of stat clients exceeded"), \
-	PARA_ERROR(UNKNOWN_STAT_ITEM, "status item not recognized"), \
 	PARA_ERROR(STAT_ITEM_PARSE, "failed to parse status item"), \
 
 
@@ -304,15 +330,12 @@ 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 \
@@ -327,6 +350,8 @@ extern const char **para_errlist[];
 	PARA_ERROR(ENCRYPT, "encrypt error"), \
 	PARA_ERROR(DECRYPT, "decrypt error"), \
 	PARA_ERROR(CHALLENGE, "failed to read challenge"), \
+	PARA_ERROR(BLINDING, "failed to activate key blinding"), \
+	PARA_ERROR(KEY_PERM, "unprotected private key"), \
 
 
 #define COMMAND_ERRORS \