X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=59c9554a5bbaecc47780292b7b873c6f0ce76535;hp=b70f7b477094478b6b20267e582a459b386c040f;hb=1b39496da38155b84636c0f7cee7f7dbbea33632;hpb=f2fa810c4bac275b4dc3ea9cd8b48d77e204618d diff --git a/error.h b/error.h index b70f7b47..59c9554a 100644 --- a/error.h +++ b/error.h @@ -18,25 +18,28 @@ /** \file error.h list of error messages for all subsystems */ -/** \cond list of all subsystems that support the shiny new error facility */ +/** \cond list of all subsystems that support the shiny error facility */ enum para_subsystem { + SS_GUI, + SS_TIME, + SS_WAV, + SS_COMPRESS, + SS_CLOSE_ON_FORK, + SS_DAEMON, + SS_DCCP_SEND, + SS_RINGBUFFER, SS_RECV, SS_NET, SS_ORTP_RECV, SS_AUDIOD, SS_EXEC, - SS_CLOSE_ON_FORK, SS_SIGNAL, SS_STRING, - SS_DAEMON, SS_STAT, - SS_TIME, SS_GRAB_CLIENT, SS_HTTP_RECV, SS_RECV_COMMON, SS_FILTER_CHAIN, - SS_WAV, - SS_COMPRESS, SS_OGGDEC, SS_FILTER, SS_COMMAND, @@ -46,8 +49,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, @@ -58,16 +61,26 @@ enum para_subsystem { SS_IPC, SS_DCCP, SS_DCCP_RECV, - SS_DCCP_SEND, SS_FD, - SS_GUI, SS_WRITE, SS_WRITE_COMMON, SS_ALSA_WRITER, SS_FILE_WRITER, - SS_RINGBUFFER}; + NUM_SS +}; + +/* these do not need error handling (yet) */ +#define SERVER_ERRORS +#define WAV_ERRORS +#define COMPRESS_ERRORS +#define TIME_ERRORS +#define CLOSE_ON_FORK_ERRORS +#define DAEMON_ERRORS +#define ORTP_SEND_ERRORS +#define GUI_ERRORS +#define RINGBUFFER_ERRORS + -#define NUM_SS (SS_RINGBUFFER + 1) extern const char **para_errlist[]; /** \endcond */ @@ -178,7 +191,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 +207,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 +216,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)"), \ @@ -280,6 +294,7 @@ extern const char **para_errlist[]; PARA_ERROR(LOCK, "lock error"), \ PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \ + #define PLAYLIST_SELECTOR_ERRORS \ PARA_ERROR(LOAD_PLAYLIST, "failed to load playlist"), \ @@ -347,25 +362,15 @@ extern const char **para_errlist[]; PARA_ERROR(FW_WRITE, "file writer write error"), \ PARA_ERROR(FW_OPEN, "file writer: can not open output file"), \ + #define WRITE_COMMON_ERRORS \ PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \ + #define AACDEC_ERRORS \ PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \ PARA_ERROR(AAC_DECODE, "aac decode error"), \ -/* these do not need error handling (yet) */ -#define SERVER_ERRORS -#define WAV_ERRORS -#define COMPRESS_ERRORS -#define TIME_ERRORS -#define CLOSE_ON_FORK_ERRORS -#define DAEMON_ERRORS -#define ORTP_SEND_ERRORS -#define GUI_ERRORS -#define RINGBUFFER_ERRORS - - /** * the subsystem shift * @@ -401,9 +406,9 @@ extern const char **para_errlist[]; /** * determine the index of an error number * - * Also easy: It's the lower 8 bits of num - 1. + * Also easy: It's the lower 8 bits of num. */ -#define ERRNUM_TO_INDEX(num) (((1 << SS_SHIFT) - 1) & ((num) - 1)) +#define ERRNUM_TO_INDEX(num) (((1 << SS_SHIFT) - 1) & (num)) /** * paraslash's version of strerror(3) @@ -414,51 +419,55 @@ extern const char **para_errlist[]; /** * define the error list for one subsystem - * + # + * The first entry (index 0) is always the name of the subsystem * Used by macros in config.h (generated by configure) */ -#define DEFINE_ERRLIST(ss) const char * ss ## _ERRLIST[] = {ss ## _ERRORS} +#define DEFINE_ERRLIST(ss) const char * ss ## _ERRLIST[] = {#ss, ss ## _ERRORS} /** * activate errors for one subsystem. * - * Each executable needs only the error lists of those subssystems it is actually - * linked with. We always reserve zeroed-out space for NUM_SS char ** pointers, but - * only init those of the needed subsystems. This macro is used by macros in config.h - * (generated by configure). + * Each executable needs only the error lists of those subssystems it is + * actually linked with. We always reserve space for NUM_SS char ** pointers, + * but only init those of the needed subsystems. This macro is used by macros + * in config.h (generated by configure). */ #define PARA_ERRLIST(ss) [SS_ ## ss] = ss ## _ERRLIST /** - * This is temporarily defined to expand to its second argument (prefixed by + * This is temporarily defined to expand to its first argument (prefixed by * 'E_') and gets later redefined to expand to the error text only */ #define PARA_ERROR(err, msg) E_ ## err +#define SS_NAME(ss) para_errlist[ss]? para_errlist[ss][0] : "" + /** \cond popcorn time */ +SS_ENUM(GUI); +SS_ENUM(WAV); +SS_ENUM(COMPRESS); +SS_ENUM(TIME); +SS_ENUM(CLOSE_ON_FORK); SS_ENUM(ORTP_RECV); SS_ENUM(NET); SS_ENUM(RECV); SS_ENUM(AUDIOD); SS_ENUM(EXEC); -SS_ENUM(CLOSE_ON_FORK); SS_ENUM(SIGNAL); SS_ENUM(STRING); SS_ENUM(DAEMON); SS_ENUM(STAT); -SS_ENUM(TIME); SS_ENUM(GRAB_CLIENT); SS_ENUM(HTTP_RECV); SS_ENUM(RECV_COMMON); SS_ENUM(FILTER_CHAIN); -SS_ENUM(WAV); -SS_ENUM(COMPRESS); 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); @@ -476,7 +485,6 @@ SS_ENUM(DCCP); SS_ENUM(DCCP_RECV); SS_ENUM(DCCP_SEND); SS_ENUM(FD); -SS_ENUM(GUI); SS_ENUM(WRITE); SS_ENUM(WRITE_COMMON); SS_ENUM(ALSA_WRITER);