X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=4cd8dafcc5e77b3dc005b4bcd5d36c5ab61735af;hb=b0a87fd7b5aeb8007afd3ac25d8548543d42080c;hp=c69a192ef694ace681aeac1232e9e196ba27aaef;hpb=30ce255fc5db519c06240951c1a36956ade789fc;p=paraslash.git

diff --git a/error.h b/error.h
index c69a192e..4cd8dafc 100644
--- a/error.h
+++ b/error.h
@@ -29,7 +29,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"), \
@@ -51,7 +50,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 +130,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(MP4_BAD_CHANNEL_COUNT, "mp4: invalid number of channels"), \
+	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_META_READ, "mp4: could not read mp4 metadata"), \
-	PARA_ERROR(MP4_META_WRITE, "mp4: could not update mp4 metadata"), \
-	PARA_ERROR(MP4_OPEN, "mp4: open failed"), \
 	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"), \
@@ -152,7 +148,6 @@
 	PARA_ERROR(NO_AUDIO_FILE, "no audio file"), \
 	PARA_ERROR(NOFD, "did not receive open fd from afs"), \
 	PARA_ERROR(NO_MATCH, "no matches"), \
-	PARA_ERROR(NO_MOOD, "no mood available"), \
 	PARA_ERROR(NO_MORE_SLOTS, "no more empty slots"), \
 	PARA_ERROR(NOT_PLAYING, "not playing"), \
 	PARA_ERROR(NO_VALID_FILES, "no valid file found in playlist"), \
@@ -173,7 +168,6 @@
 	PARA_ERROR(OPUS_SET_GAIN, "opus: could not set gain"), \
 	PARA_ERROR(PATH_FOUND, ""), /* not really an error */ \
 	PARA_ERROR(PLAYLIST_EMPTY, "attempted to load empty playlist"), \
-	PARA_ERROR(PLAYLIST_LOADED, ""), /* not really an error */ \
 	PARA_ERROR(PREBUFFER_SUCCESS, "prebuffering complete"), \
 	PARA_ERROR(PRIVATE_KEY, "can not read private key"), \
 	PARA_ERROR(QUEUE, "packet queue overrun"), \