X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=843c4ee8c23c0b8a32e7867981cfaa222b8fac0a;hb=d440a71683940a58747de6dc32643db452d9cf54;hp=e94821212fb6ecb0c46fbfa5230a04f5b2295b88;hpb=46b9e018548fa7baebe62b6c724d215c84dcb20f;p=paraslash.git

diff --git a/error.h b/error.h
index e9482121..843c4ee8 100644
--- a/error.h
+++ b/error.h
@@ -13,7 +13,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"), \
@@ -138,14 +137,13 @@
 	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_BAD_CHANNEL_COUNT, "mp4: invalid number of channels"), \
+	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_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"), \
@@ -173,7 +171,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"), \