X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=b3eb7e6edef673e5c6c5929e26c1e9157630c560;hb=8aa0f575bcca12ab63ab53141c2144448c457478;hp=1e4bf044fe98d49490604b352517afbcba6f2ab8;hpb=37dcd255ceb88c02cab500069956f4589c9d13e7;p=paraslash.git

diff --git a/error.h b/error.h
index 1e4bf044..b3eb7e6e 100644
--- a/error.h
+++ b/error.h
@@ -6,7 +6,7 @@
 
 /** \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;
@@ -318,6 +318,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 \
@@ -424,24 +425,10 @@ extern const char **para_errlist[];
 
 
 #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, "alsa error"), \
 
 
 #define WRITE_COMMON_ERRORS \
-	PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \
 	PARA_ERROR(WRITE_COMMON_EOF, "end of file"), \
 
 
@@ -454,7 +441,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(QUEUE, "packet queue overrun"), \
 
 
-/** \endcond */
+/** \endcond errors */
 
 /**
  * The subsystem shift.