X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=924f96076fce2b80bf78ef9e360b2497c0ec7d1f;hp=880df55bdc43254e05b20215edf6b86cfdf740bf;hb=90501714a4379e36e191a7d5330378f898ac258f;hpb=924db525a63d5aac65c09f2e8c6b72a733854414

diff --git a/error.h b/error.h
index 880df55b..924f9607 100644
--- a/error.h
+++ b/error.h
@@ -46,9 +46,12 @@ 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,
+	SS_AAC_COMMON,
 	SS_SERVER,
 	SS_AFS,
 	SS_MYSQL_SELECTOR,
@@ -58,8 +61,10 @@ enum para_subsystem {
 	SS_DCCP_SEND,
 	SS_FD,
 	SS_GUI,
-	SS_PLAY,
-	SS_ALSA,
+	SS_WRITE,
+	SS_WRITE_COMMON,
+	SS_ALSA_WRITER,
+	SS_FILE_WRITER,
 	SS_RINGBUFFER};
 
 #define NUM_SS (SS_RINGBUFFER + 1)
@@ -173,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"), \
@@ -185,7 +190,20 @@ extern const char **para_errlist[];
 	PARA_ERROR(HEADER_BITRATE, "invalid header bitrate"), \
 
 
-#define OGG_ERRORS \
+#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_BUF, "invalid buffer"), \
+	PARA_ERROR(ESDS, "did not find esds atom"), \
+	PARA_ERROR(STCO, "did not find stco atom"), \
+
+
+#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)"), \
@@ -297,12 +315,15 @@ extern const char **para_errlist[];
 	PARA_ERROR(F_SETFL, "failed to set fd flags"), \
 
 
-#define PLAY_ERRORS \
+#define WRITE_ERRORS \
 	PARA_ERROR(READ_HDR, "failed to read audio file header"), \
 	PARA_ERROR(READ_STDIN, "failed to read from stdin"), \
-	PARA_ERROR(PLAY_SYNTAX, "syntax error"), \
-	PARA_ERROR(PLAY_OVERRUN, "buffer overrun"), \
+	PARA_ERROR(WRITE_SYNTAX, "para_write syntax error"), \
+	PARA_ERROR(WRITE_OVERRUN, "buffer overrun"), \
 	PARA_ERROR(PREMATURE_END, "premature end of audio file"), \
+
+
+#define ALSA_WRITER_ERRORS \
 	PARA_ERROR(BROKEN_CONF, "Broken alsa configuration"), \
 	PARA_ERROR(ACCESS_TYPE, "alsa access type not available"), \
 	PARA_ERROR(SAMPLE_FORMAT, "sample format not available"), \
@@ -323,9 +344,18 @@ extern const char **para_errlist[];
 	PARA_ERROR(ALSA_LOG, "snd_output_stdio_attach() failed"), \
 
 
+#define FILE_WRITER_ERRORS \
+	PARA_ERROR(FW_WRITE, "file writer write error"), \
+	PARA_ERROR(FW_OPEN, "file writer: can not open output file"), \
+
+#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 ALSA_ERRORS
 #define SERVER_ERRORS
 #define WAV_ERRORS
 #define COMPRESS_ERRORS
@@ -426,9 +456,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(MP3_AFH);
+SS_ENUM(OGG_AFH);
+SS_ENUM(AAC_AFH);
+SS_ENUM(AAC_COMMON);
 SS_ENUM(SERVER);
 SS_ENUM(AFS);
 SS_ENUM(COMMAND);
@@ -445,8 +478,10 @@ SS_ENUM(DCCP_RECV);
 SS_ENUM(DCCP_SEND);
 SS_ENUM(FD);
 SS_ENUM(GUI);
-SS_ENUM(PLAY);
-SS_ENUM(ALSA);
+SS_ENUM(WRITE);
+SS_ENUM(WRITE_COMMON);
+SS_ENUM(ALSA_WRITER);
+SS_ENUM(FILE_WRITER);
 SS_ENUM(RINGBUFFER);
 /** \endcond */
 #undef PARA_ERROR