X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=f19aa634bf1f8a2306249a8898eacfefd0078a06;hb=22faac786c18ab3759fd30f85c957721708388d1;hp=e94821212fb6ecb0c46fbfa5230a04f5b2295b88;hpb=88bf6848d1c58ad0e0d9b62d7da2a81cea5bf0ff;p=paraslash.git

diff --git a/error.h b/error.h
index e9482121..f19aa634 100644
--- a/error.h
+++ b/error.h
@@ -2,6 +2,7 @@
 
 /** \file error.h List of error codes and messages. */
 
+/** \cond para_error */
 /** Codes and messages. */
 #define PARA_ERRORS \
 	PARA_ERROR(SUCCESS, "success"), \
@@ -13,7 +14,6 @@
 	PARA_ERROR(AFS_SHORT_READ, "short read from afs socket"), \
 	PARA_ERROR(AFS_SIGNAL, "afs caught deadly signal"), \
 	PARA_ERROR(AFS_SOCKET, "afs socket not writable"), \
-	PARA_ERROR(AFT_SYNTAX, "audio file table syntax error"), \
 	PARA_ERROR(ALSA, "alsa error"), \
 	PARA_ERROR(ALSA_MIX_GET_VAL, "could not read control element state"), \
 	PARA_ERROR(ALSA_MIX_OPEN, "could not open mixer"), \
@@ -30,7 +30,6 @@
 	PARA_ERROR(AO_OPEN_LIVE, "ao: could not open audio device"), \
 	PARA_ERROR(AO_PLAY, "ao_play() failed"), \
 	PARA_ERROR(AO_PTHREAD, "pthread error"), \
-	PARA_ERROR(ARG_NOT_FOUND, "argument not found in arg vector"), \
 	PARA_ERROR(ASN1_PARSE, "could not parse ASN.1 key"), \
 	PARA_ERROR(ATOI_JUNK_AT_END, "further characters after number"), \
 	PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \
@@ -52,7 +51,6 @@
 	PARA_ERROR(BAD_CT, "invalid chunk table or bad FEC configuration"), \
 	PARA_ERROR(BAD_FEATURE, "invalid feature request"), \
 	PARA_ERROR(BAD_FEC_HEADER, "invalid fec header"), \
-	PARA_ERROR(BAD_LL, "invalid loglevel"), \
 	PARA_ERROR(BAD_PATH, "invalid path"), \
 	PARA_ERROR(BAD_PRIVATE_KEY, "invalid private key"), \
 	PARA_ERROR(BAD_SAMPLE_FORMAT, "sample format not supported"), \
@@ -133,19 +131,17 @@
 	PARA_ERROR(MAKESOCK, "makesock error"), \
 	PARA_ERROR(MAX_CLIENTS, "maximal number of clients exceeded"), \
 	PARA_ERROR(MISSING_COLON, "syntax error: missing colon"), \
-	PARA_ERROR(MOOD_SYNTAX, "mood syntax error"), \
 	PARA_ERROR(MOOD_PARSE, "mood parse error"), \
 	PARA_ERROR(MP3DEC_CORRUPT, "too many corrupt frames"), \
 	PARA_ERROR(MP3DEC_EOF, "mp3dec: end of file"), \
 	PARA_ERROR(MP3_INFO, "could not read mp3 info"), \
-	PARA_ERROR(MP4FF_BAD_CHANNEL_COUNT, "mp4ff: invalid number of channels"), \
-	PARA_ERROR(MP4FF_BAD_SAMPLE, "mp4ff: invalid sample number"), \
-	PARA_ERROR(MP4FF_BAD_SAMPLERATE, "mp4ff: invalid sample rate"), \
-	PARA_ERROR(MP4FF_BAD_SAMPLE_COUNT, "mp4ff: invalid number of samples"), \
-	PARA_ERROR(MP4FF_META_READ, "mp4ff: could not read mp4 metadata"), \
-	PARA_ERROR(MP4FF_META_WRITE, "mp4ff: could not update mp4 metadata"), \
-	PARA_ERROR(MP4FF_OPEN, "mp4ff: open failed"), \
-	PARA_ERROR(MP4FF_TRACK, "mp4ff: no audio track"), \
+	PARA_ERROR(MP4_READ, "mp4: read error or unexpected end of file"), \
+	PARA_ERROR(MP4_CORRUPT, "invalid/corrupt mp4 file"), \
+	PARA_ERROR(MP4_BAD_SAMPLE, "mp4: invalid sample number"), \
+	PARA_ERROR(MP4_BAD_SAMPLERATE, "mp4: invalid sample rate"), \
+	PARA_ERROR(MP4_BAD_SAMPLE_COUNT, "mp4: invalid number of samples"), \
+	PARA_ERROR(MP4_TRACK, "mp4: no audio track"), \
+	PARA_ERROR(MP4_MISSING_ATOM, "mp4: essential atom not found"), \
 	PARA_ERROR(MPI_SCAN, "could not scan multi-precision integer"), \
 	PARA_ERROR(NAME_TOO_LONG, "name too long for struct sockaddr_un"), \
 	PARA_ERROR(NO_AFHI, "audio format handler info required"), \
@@ -173,7 +169,6 @@
 	PARA_ERROR(OPUS_HEADER, "invalid opus header"), \
 	PARA_ERROR(OPUS_SET_GAIN, "opus: could not set gain"), \
 	PARA_ERROR(PATH_FOUND, ""), /* not really an error */ \
-	PARA_ERROR(PERM, "permission denied"), \
 	PARA_ERROR(PLAYLIST_EMPTY, "attempted to load empty playlist"), \
 	PARA_ERROR(PLAYLIST_LOADED, ""), /* not really an error */ \
 	PARA_ERROR(PREBUFFER_SUCCESS, "prebuffering complete"), \
@@ -267,6 +262,7 @@ enum para_error_codes {PARA_ERRORS};
 extern const char * const para_errlist[];
 /** Exactly one .c file per executable must define the array. */
 #define DEFINE_PARA_ERRLIST const char * const para_errlist[] = {PARA_ERRORS}
+/** \endcond para_error */
 
 /**
  * This bit indicates whether a number is considered a system error number