X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=614390f282546a0f2ca7624db8c4964891376b5f;hp=81691667d277fe710498c872d299f053fd01fe99;hb=446f934790d9d60b4aaa63faa41217fa8134a4be;hpb=773bdfd137b4d4bb350903a1cb6b25ef304b3e0a

diff --git a/error.h b/error.h
index 81691667..614390f2 100644
--- a/error.h
+++ b/error.h
@@ -49,6 +49,7 @@ enum para_subsystem {
 	SS_OGG,
 	SS_MP3,
 	SS_MP3DEC,
+	SS_AACDEC,
 	SS_SERVER,
 	SS_AFS,
 	SS_MYSQL_SELECTOR,
@@ -58,8 +59,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)
@@ -297,13 +300,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(LIST_WRITERS_GIVEN, ""), \
+	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"), \
@@ -322,13 +327,23 @@ extern const char **para_errlist[];
 	PARA_ERROR(START_THRESHOLD, "snd_pcm_sw_params_set_start_threshold() failed"), \
 	PARA_ERROR(STOP_THRESHOLD, "snd_pcm_sw_params_set_stop_threshold() failed"), \
 	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(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 ALSA_ERRORS
 #define SERVER_ERRORS
 #define WAV_ERRORS
 #define COMPRESS_ERRORS
@@ -429,6 +444,7 @@ SS_ENUM(WAV);
 SS_ENUM(COMPRESS);
 SS_ENUM(OGGDEC);
 SS_ENUM(MP3DEC);
+SS_ENUM(AACDEC);
 SS_ENUM(FILTER);
 SS_ENUM(MP3);
 SS_ENUM(OGG);
@@ -448,8 +464,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