X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=eda696274f812e6d7c4a723d48879b203da458a9;hp=d0c3afc20ed6ea6f026af2119a8cb05f5224de0a;hb=e19276003c9158fceccae4d7e626cabb2fb5b0dd;hpb=850791c25b352396d11a1ca658fb735d057c9e57

diff --git a/error.h b/error.h
index d0c3afc2..eda69627 100644
--- a/error.h
+++ b/error.h
@@ -48,7 +48,10 @@ enum para_subsystem {
 	SS_DB,
 	SS_OGG,
 	SS_MP3,
+	SS_AAC_AFH,
 	SS_MP3DEC,
+	SS_AACDEC,
+	SS_AAC_COMMON,
 	SS_SERVER,
 	SS_AFS,
 	SS_MYSQL_SELECTOR,
@@ -187,6 +190,15 @@ extern const char **para_errlist[];
 	PARA_ERROR(HEADER_BITRATE, "invalid header bitrate"), \
 
 
+#define AAC_AFH_ERRORS \
+	PARA_ERROR(AAC_REPOS, "aac repositioning error"), \
+	PARA_ERROR(AAC_READ, "aac read error"), \
+
+
+#define AAC_COMMON_ERRORS \
+	PARA_ERROR(AAC_OPEN, "NeAACDecOpen() failed"), \
+	PARA_ERROR(AAC_BUF, "invalid buffer"), \
+
 #define OGG_ERRORS \
 	PARA_ERROR(OGG_READ, "ogg read error"), \
 	PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \
@@ -335,6 +347,12 @@ extern const char **para_errlist[];
 #define WRITE_COMMON_ERRORS \
 	PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \
 
+#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) */
 #define SERVER_ERRORS
@@ -437,9 +455,12 @@ SS_ENUM(WAV);
 SS_ENUM(COMPRESS);
 SS_ENUM(OGGDEC);
 SS_ENUM(MP3DEC);
+SS_ENUM(AACDEC);
 SS_ENUM(FILTER);
 SS_ENUM(MP3);
 SS_ENUM(OGG);
+SS_ENUM(AAC_AFH);
+SS_ENUM(AAC_COMMON);
 SS_ENUM(SERVER);
 SS_ENUM(AFS);
 SS_ENUM(COMMAND);