rename mp3.c to mp3_afh.c and ogg.c to ogg_afh.c

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index eda696274f812e6d7c4a723d48879b203da458a9..924f96076fce2b80bf78ef9e360b2497c0ec7d1f 100644 (file)
--- a/error.h
+++ b/error.h
@@ -46,8 +46,8 @@ enum para_subsystem {
        SS_HTTP_SEND,
        SS_ORTP_SEND,
        SS_DB,
-       SS_OGG,
-       SS_MP3,
+       SS_OGG_AFH,
+       SS_MP3_AFH,
        SS_AAC_AFH,
        SS_MP3DEC,
        SS_AACDEC,
@@ -178,7 +178,7 @@ extern const char **para_errlist[];
        PARA_ERROR(NULL_OPEN, "can not open /dev/null"), \
 
 
-#define MP3_ERRORS \
+#define MP3_AFH_ERRORS \
        PARA_ERROR(FREAD, "fread error"), \
        PARA_ERROR(FSEEK, "fseek error"), \
        PARA_ERROR(FRAME, "invalid mp3 frame"), \
@@ -193,13 +193,17 @@ extern const char **para_errlist[];
 #define AAC_AFH_ERRORS \
        PARA_ERROR(AAC_REPOS, "aac repositioning error"), \
        PARA_ERROR(AAC_READ, "aac read error"), \
+       PARA_ERROR(STSZ, "did not find stcz atom"), \
+       PARA_ERROR(MP4ASC, "audio spec config error"), \
 
 
 #define AAC_COMMON_ERRORS \
-       PARA_ERROR(AAC_OPEN, "NeAACDecOpen() failed"), \
        PARA_ERROR(AAC_BUF, "invalid buffer"), \
+       PARA_ERROR(ESDS, "did not find esds atom"), \
+       PARA_ERROR(STCO, "did not find stco atom"), \
+
 
-#define OGG_ERRORS \
+#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)"), \
@@ -349,9 +353,6 @@ extern const char **para_errlist[];
 
 #define AACDEC_ERRORS \
        PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
-       PARA_ERROR(ESDS, "did not find esds atom"), \
-       PARA_ERROR(STSZ, "did not find stsz atom"), \
-       PARA_ERROR(STCO, "did not find stco atom"), \
        PARA_ERROR(AAC_DECODE, "aac decode error"), \
 
 /* these do not need error handling (yet) */
@@ -457,8 +458,8 @@ SS_ENUM(OGGDEC);
 SS_ENUM(MP3DEC);
 SS_ENUM(AACDEC);
 SS_ENUM(FILTER);
-SS_ENUM(MP3);
-SS_ENUM(OGG);
+SS_ENUM(MP3_AFH);
+SS_ENUM(OGG_AFH);
 SS_ENUM(AAC_AFH);
 SS_ENUM(AAC_COMMON);
 SS_ENUM(SERVER);