Merge branch 'maint'

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 7553699c534300c907d2989135fe1c8ff5d88cfa..755821068cabc9d33525cf28189b81015365974d 100644 (file)
--- a/error.h
+++ b/error.h
@@ -34,25 +34,32 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define SERVER_COMMAND_LIST_ERRORS
 #define AFS_COMMAND_LIST_ERRORS
 #define AUDIOD_COMMAND_LIST_ERRORS
-#define WMA_AFH_ERRORS
-#define WMA_COMMON_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_DECODE, "wma decode error"), \
+       PARA_ERROR(WMA_BLOCK_SIZE, "invalid block size"), \
        PARA_ERROR(INCOHERENT_BLOCK_LEN, "incoherent block length"), \
 
 
-#define BITSTREAM_ERRORS \
-       PARA_ERROR(TABLE_ALLOC, "failed to allocate table"), \
-       PARA_ERROR(BAD_CODES, "detected incorrect codes")
-
-
-#define MDCT_ERRORS \
+#define IMDCT_ERRORS \
        PARA_ERROR(FFT_BAD_PARAMS, "invalid params for fft"), \