X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=b70f7b477094478b6b20267e582a459b386c040f;hp=237978eb88a80462d7c5f6e08b43a54f2969cb70;hb=ccf42979a31a56e991b5c6d7d4043381f7487d6e;hpb=780f86d5f849308b5100b087c6b223a6deef1dd7

diff --git a/error.h b/error.h
index 237978eb..b70f7b47 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,18 @@ 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"), \
+	PARA_ERROR(STSZ, "did not find stcz atom"), \
+
+
+#define AAC_COMMON_ERRORS \
+	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 \
 	PARA_ERROR(OGG_READ, "ogg read error"), \
 	PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \
@@ -304,7 +319,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(READ_STDIN, "failed to read from stdin"), \
 	PARA_ERROR(WRITE_SYNTAX, "para_write syntax error"), \
 	PARA_ERROR(WRITE_OVERRUN, "buffer overrun"), \
-	PARA_ERROR(LIST_WRITERS_GIVEN, ""), \
 	PARA_ERROR(PREMATURE_END, "premature end of audio file"), \
 
 
@@ -336,6 +350,9 @@ 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(AAC_DECODE, "aac decode error"), \
 
 /* these do not need error handling (yet) */
 #define SERVER_ERRORS
@@ -438,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);