X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=924f96076fce2b80bf78ef9e360b2497c0ec7d1f;hp=b70f7b477094478b6b20267e582a459b386c040f;hb=90501714a4379e36e191a7d5330378f898ac258f;hpb=f2fa810c4bac275b4dc3ea9cd8b48d77e204618d diff --git a/error.h b/error.h index b70f7b47..924f9607 100644 --- a/error.h +++ b/error.h @@ -46,8 +46,8 @@ enum para_subsystem { SS_HTTP_SEND, SS_ORTP_SEND, SS_DB, - SS_OGG, - SS_MP3, + SS_OGG_AFH, + SS_MP3_AFH, SS_AAC_AFH, SS_MP3DEC, SS_AACDEC, @@ -178,7 +178,7 @@ extern const char **para_errlist[]; PARA_ERROR(NULL_OPEN, "can not open /dev/null"), \ -#define MP3_ERRORS \ +#define MP3_AFH_ERRORS \ PARA_ERROR(FREAD, "fread error"), \ PARA_ERROR(FSEEK, "fseek error"), \ PARA_ERROR(FRAME, "invalid mp3 frame"), \ @@ -194,6 +194,7 @@ extern const char **para_errlist[]; 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"), \ #define AAC_COMMON_ERRORS \ @@ -202,7 +203,7 @@ extern const char **para_errlist[]; PARA_ERROR(STCO, "did not find stco atom"), \ -#define OGG_ERRORS \ +#define OGG_AFH_ERRORS \ PARA_ERROR(OGG_READ, "ogg read error"), \ PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \ PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \ @@ -457,8 +458,8 @@ SS_ENUM(OGGDEC); SS_ENUM(MP3DEC); SS_ENUM(AACDEC); SS_ENUM(FILTER); -SS_ENUM(MP3); -SS_ENUM(OGG); +SS_ENUM(MP3_AFH); +SS_ENUM(OGG_AFH); SS_ENUM(AAC_AFH); SS_ENUM(AAC_COMMON); SS_ENUM(SERVER);