X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=63d4d5db9b6690dacd49505dda27504120309fe7;hp=da0efc47f6ea317d8f026482a76d0c18dead58d6;hb=748d1368bc96dd7e1af879df1ea41b4d52842f7e;hpb=8c8d095eaf5207d4446c561bf26f0eecd2d5f505

diff --git a/error.h b/error.h
index da0efc47..63d4d5db 100644
--- a/error.h
+++ b/error.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file error.h List of error messages for all subsystems. */
 
-/** \cond */
+/** \cond errors */
 
 /* List of all subsystems that use paraslash's error facility. */
 DEFINE_ERRLIST_OBJECT_ENUM;
@@ -34,9 +34,28 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define STDOUT_ERRORS
 #define FILE_WRITE_ERRORS
 #define STDIN_ERRORS
+#define WRITE_ERRORS
 
 extern const char **para_errlist[];
 
+#define FLACDEC_FILTER_ERRORS \
+	PARA_ERROR(FLACDEC_DECODER_ALLOC, "could not allocate stream decoder"), \
+	PARA_ERROR(FLACDEC_DECODER_INIT, "could not init stream decoder"), \
+	PARA_ERROR(FLACDEC_EOF, "flacdec encountered end of file condition"), \
+
+
+#define FLAC_AFH_ERRORS \
+	PARA_ERROR(FLAC_CHAIN_ALLOC, "could not create metadata chain"), \
+	PARA_ERROR(FLAC_CHAIN_READ, "could not read meta chain"), \
+	PARA_ERROR(FLAC_ITER_ALLOC, "could not allocate meta iterator"), \
+	PARA_ERROR(FLAC_VARBLOCK, "variable blocksize not supported"), \
+	PARA_ERROR(FLAC_AFH_DECODER_ALLOC, "could not allocate stream decoder"), \
+	PARA_ERROR(FLAC_AFH_DECODER_INIT, "could not init stream decoder"), \
+	PARA_ERROR(FLAC_SKIP_META, "could not skip metadata"), \
+	PARA_ERROR(FLAC_DECODE_POS, "could not get decode position"), \
+	PARA_ERROR(FLAC_STREAMINFO, "could not read stream info meta block"), \
+
+
 #define OGG_AFH_COMMON_ERRORS \
 	PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error (first packet)"), \
 	PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \
@@ -229,6 +248,7 @@ extern const char **para_errlist[];
 
 #define AUDIOC_ERRORS \
 	PARA_ERROR(AUDIOC_SYNTAX, "audioc syntax error"), \
+	PARA_ERROR(AUDIOC_EOF, "audioc: end of file"), \
 
 
 #define CLIENT_COMMON_ERRORS \
@@ -317,6 +337,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(MAD_FRAME_DECODE, "mad frame decode error"), \
 	PARA_ERROR(MP3DEC_SYNTAX, "syntax error in mp3dec config"), \
 	PARA_ERROR(MP3DEC_EOF, "mp3dec: end of file"), \
+	PARA_ERROR(MP3DEC_CORRUPT, "too many corrupt frames"), \
 
 
 #define FILTER_ERRORS \
@@ -422,30 +443,11 @@ extern const char **para_errlist[];
 	PARA_ERROR(READ_PATTERN, "did not read expected pattern"), \
 
 
-#define WRITE_ERRORS \
-	PARA_ERROR(WRITE_SYNTAX, "para_write syntax error"), \
-
-
 #define ALSA_WRITE_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(BAD_PERIOD, "can not use period equal to buffer size"), \
-	PARA_ERROR(ALSA_WRITE, "alsa write error"), \
-	PARA_ERROR(PCM_OPEN, "unable to open pcm"), \
-	PARA_ERROR(PHYSICAL_WIDTH, "unable to determine bytes per frame"), \
-	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_POLL_FDS, "could not get alsa poll fd"), \
+	PARA_ERROR(ALSA, "alsa error"), \
 
 
 #define WRITE_COMMON_ERRORS \
-	PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \
 	PARA_ERROR(WRITE_COMMON_EOF, "end of file"), \
 
 
@@ -458,7 +460,11 @@ extern const char **para_errlist[];
 	PARA_ERROR(QUEUE, "packet queue overrun"), \
 
 
-/** \endcond */
+#define INTERACTIVE_ERRORS \
+	PARA_ERROR(I9E_EOF, "end of input"), \
+	PARA_ERROR(I9E_SETUPTERM, "failed to set up terminal"), \
+
+/** \endcond errors */
 
 /**
  * The subsystem shift.