X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=25eedf5a6a3d92682b11f6879f38e0f18fb511ba;hp=24a2e3d9205f511737bb35863a0695c6946d46b8;hb=792936cec17542777826e5fce4cfe520a984bba2;hpb=53d5ac455d0616a5ee8867c986631ed34c177a42

diff --git a/error.h b/error.h
index 24a2e3d9..25eedf5a 100644
--- a/error.h
+++ b/error.h
@@ -8,14 +8,12 @@
 
 /** Codes and messages. */
 #define PARA_ERRORS \
-	PARA_ERROR(AAC_AFH_INIT, "failed to init aac decoder"), \
 	PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
 	PARA_ERROR(AAC_DECODE, "aac decode error"), \
 	PARA_ERROR(ACL_PERM, "access denied by acl"), \
 	PARA_ERROR(ADD_CALLBACK, "can not add callback"), \
 	PARA_ERROR(ADDRESS_LOOKUP, "can not resolve requested address"),\
 	PARA_ERROR(AFH_RECV_BAD_FILENAME, "no file name given"), \
-	PARA_ERROR(AFH_SYNTAX, "afh syntax error"), \
 	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"), \
@@ -52,6 +50,7 @@
 	PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \
 	PARA_ERROR(AUTH_REQUEST, "did not receive auth request"), \
 	PARA_ERROR(BAD_AFSI, "invalid afs info"), \
+	PARA_ERROR(BAD_ASF_FILE_PROPS, "invalid ASF file properties"), \
 	PARA_ERROR(BAD_AUTH, "authentication failure"), \
 	PARA_ERROR(BAD_BAND, "invalid or unexpected band designator"), \
 	PARA_ERROR(BAD_CHANNEL_COUNT, "channel count not supported"), \
@@ -94,7 +93,6 @@
 	PARA_ERROR(EMPTY, "file is empty"), \
 	PARA_ERROR(ENCRYPT, "encrypt error"), \
 	PARA_ERROR(EOF, "end of file"), \
-	PARA_ERROR(ESDS, "did not find esds atom"), \
 	PARA_ERROR(FEC_BAD_IDX, "invalid index vector"), \
 	PARA_ERROR(FECDEC_EOF, "received eof packet"), \
 	PARA_ERROR(FECDEC_OVERRUN, "fecdec output buffer overrun"), \
@@ -149,8 +147,14 @@
 	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(MP4ASC, "audio spec config error"), \
-	PARA_ERROR(MP4V2, "mp4v2 library error"), \
+	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(MPI_PRINT, "could not convert multi-precision integer"), \
 	PARA_ERROR(MPI_SCAN, "could not scan multi-precision integer"), \
 	PARA_ERROR(NAME_TOO_LONG, "name too long for struct sockaddr_un"), \
@@ -226,14 +230,12 @@
 	PARA_ERROR(SSH_PARSE, "could not parse ssh public key"), \
 	PARA_ERROR(STAT_ITEM_PARSE, "failed to parse status item"), \
 	PARA_ERROR(STATUS_TIMEOUT, "status item timeout"), \
-	PARA_ERROR(STCO, "did not find stco atom"), \
 	PARA_ERROR(STREAM_FORMAT, "could not set stream format"), \
 	PARA_ERROR(STREAM_PACKETIN, "ogg stream packet-in error"), \
 	PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error"), \
 	PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error"), \
 	PARA_ERROR(STREAM_PAGEOUT, "ogg stream page-out error"), \
 	PARA_ERROR(STRFTIME, "strftime() failed"), \
-	PARA_ERROR(STSZ, "did not find stcz atom"), \
 	PARA_ERROR(SYNC_COMPLETE, "all buddies in sync"), \
 	PARA_ERROR(SYNC_LISTEN_FD, "no fd to listen on"), \
 	PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \