X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=d8c92293e0d3c11b4d03b0e5596fdb95fc064941;hb=3450a4ee2962926a58b0e48bb19f8a7544450518;hp=537aca5723e48a2ea32037fd342dca2f5068859c;hpb=c85690666e2ed2327e751b819970658d58479bfb;p=paraslash.git diff --git a/error.h b/error.h index 537aca57..d8c92293 100644 --- a/error.h +++ b/error.h @@ -264,8 +264,6 @@ extern const char **para_errlist[]; #define MP3_AFH_ERRORS \ - PARA_ERROR(FREAD, "fread error"), \ - PARA_ERROR(FSEEK, "fseek error"), \ PARA_ERROR(FRAME, "invalid mp3 frame"), \ PARA_ERROR(FRAME_LENGTH, "invalid frame length"), \ PARA_ERROR(MP3_NO_FILE, "invalid mp3 file pointer"), \ @@ -276,11 +274,8 @@ extern const char **para_errlist[]; #define AAC_AFH_ERRORS \ - PARA_ERROR(AAC_REPOS, "aac repositioning error"), \ - PARA_ERROR(AAC_READ, "aac read error"), \ PARA_ERROR(STSZ, "did not find stcz atom"), \ PARA_ERROR(MP4ASC, "audio spec config error"), \ - PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \ #define AAC_COMMON_ERRORS \ @@ -303,6 +298,7 @@ extern const char **para_errlist[]; #define VSS_ERRORS \ PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ PARA_ERROR(FSTAT, "failed to fstat() audio file"), \ + PARA_ERROR(EMPTY_CHUNK, "empty chunk"), \ #define AFS_ERRORS \ @@ -401,6 +397,8 @@ extern const char **para_errlist[]; PARA_ERROR(F_GETFL, "failed to get fd flags"), \ PARA_ERROR(F_SETFL, "failed to set fd flags"), \ PARA_ERROR(FGETS, "fgets error"), \ + PARA_ERROR(FSEEK, "fseek error"), \ + PARA_ERROR(FREAD, "fread error"), \ #define WRITE_ERRORS \ @@ -446,6 +444,7 @@ extern const char **para_errlist[]; #define AACDEC_ERRORS \ PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \ PARA_ERROR(AAC_DECODE, "aac decode error"), \ + PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \ /**