X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=a644b96777db3ea27803d870babe49b0e744de4b;hb=4ce5b6570ed83ef2ab5296f369f147593507286b;hp=cd5c20ef8f44501429ea8a9ab16b4bfe25d62b54;hpb=c20e3e67fc2be1d5f8778b9c482271e023bbdcb8;p=paraslash.git

diff --git a/error.h b/error.h
index cd5c20ef..a644b967 100644
--- a/error.h
+++ b/error.h
@@ -51,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"), \
@@ -132,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"), \
@@ -172,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"), \