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

diff --git a/error.h b/error.h
index ceaa6b38..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,
@@ -57,6 +60,11 @@ enum para_subsystem {
 	SS_DCCP_RECV,
 	SS_DCCP_SEND,
 	SS_FD,
+	SS_GUI,
+	SS_WRITE,
+	SS_WRITE_COMMON,
+	SS_ALSA_WRITER,
+	SS_FILE_WRITER,
 	SS_RINGBUFFER};
 
 #define NUM_SS (SS_RINGBUFFER + 1)
@@ -157,6 +165,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(SIGNAL_SIG_ERR, "signal() retured SIG_ERR"), \
 	PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \
 	PARA_ERROR(WAITPID, "waitpid error"), \
+	PARA_ERROR(SIGNAL_PIPE, "failed to setup signal pipe"), \
 
 
 #define STRING_ERRORS \
@@ -169,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"), \
@@ -181,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)"), \
@@ -238,6 +260,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(GET_AUDIO_FILE, "can not get current audio file"), \
 	PARA_ERROR(GET_STREAM, "can not get current stream"), \
 	PARA_ERROR(NO_STREAM, "no such stream"), \
+	PARA_ERROR(AUDIO_FILE, "no such audio file"), \
 	PARA_ERROR(GET_QUERY, "can not get query for specified stream"), \
 	PARA_ERROR(TMPFILE, "error while writing temporary file"), \
 	PARA_ERROR(META, "can not get meta data"), \
@@ -287,6 +310,50 @@ extern const char **para_errlist[];
 	PARA_ERROR(DCCP_LISTEN, "dccp listen error"), \
 	PARA_ERROR(DCCP_WRITE, "dccp write error"), \
 
+#define FD_ERRORS \
+	PARA_ERROR(F_GETFL, "failed to get fd flags"), \
+	PARA_ERROR(F_SETFL, "failed to set fd flags"), \
+
+
+#define WRITE_ERRORS \
+	PARA_ERROR(READ_HDR, "failed to read audio file header"), \
+	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(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"), \
+	PARA_ERROR(CHANNEL_COUNT, "channels count not available"), \
+	PARA_ERROR(HW_PARAMS, "unable to install hw params"), \
+	PARA_ERROR(SW_PARAMS, "unable to install sw params"), \
+	PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \
+	PARA_ERROR(GET_XFER, "unable to obtain xfer align"), \
+	PARA_ERROR(SET_XFER, "snd_pcm_sw_params_set_xfer_align() failed"), \
+	PARA_ERROR(ALSA_WRITE, "alsa write error"), \
+	PARA_ERROR(PCM_OPEN, "unable to open pcm"), \
+	PARA_ERROR(SND_PCM_INFO, "pcm info error"), \
+	PARA_ERROR(GET_BUFFER_TIME, "snd_pcm_hw_params_get_buffer_time_max() failed"), \
+	PARA_ERROR(SET_BUFFER_TIME, "snd_pcm_hw_params_set_buffer_time_near() failed"), \
+	PARA_ERROR(SET_RATE, "snd_pcm_hw_params_set_rate_near failed"), \
+	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(AAC_DECODE, "aac decode error"), \
 
 /* these do not need error handling (yet) */
 #define SERVER_ERRORS
@@ -296,8 +363,8 @@ extern const char **para_errlist[];
 #define CLOSE_ON_FORK_ERRORS
 #define DAEMON_ERRORS
 #define ORTP_SEND_ERRORS
+#define GUI_ERRORS
 #define RINGBUFFER_ERRORS
-#define FD_ERRORS
 
 
 /**
@@ -389,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);
@@ -407,6 +477,11 @@ SS_ENUM(DCCP);
 SS_ENUM(DCCP_RECV);
 SS_ENUM(DCCP_SEND);
 SS_ENUM(FD);
+SS_ENUM(GUI);
+SS_ENUM(WRITE);
+SS_ENUM(WRITE_COMMON);
+SS_ENUM(ALSA_WRITER);
+SS_ENUM(FILE_WRITER);
 SS_ENUM(RINGBUFFER);
 /** \endcond */
 #undef PARA_ERROR