X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=5d5666c63285835691ca65e95411e7dfc40eb99e;hp=08b309ce398d8375c334eb420d6e94408a223189;hb=0f4910b50116416fefb09ca67a615679067ef359;hpb=bb4e94595a1e57e66deacd4efc3512d947f16f19 diff --git a/error.h b/error.h index 08b309ce..5d5666c6 100644 --- a/error.h +++ b/error.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2013 Andre Noll + * Copyright (C) 2006 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -16,11 +16,9 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define TIME_ERRORS #define CLOSE_ON_FORK_ERRORS #define DAEMON_ERRORS -#define GUI_ERRORS #define GUI_THEME_ERRORS #define RINGBUFFER_ERRORS #define SCORE_ERRORS -#define RBTREE_ERRORS #define RECV_ERRORS #define IPC_ERRORS #define DCCP_SEND_ERRORS @@ -28,7 +26,7 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define GGO_ERRORS #define COLOR_ERRORS #define SIGNAL_ERRORS -#define FADE_ERRORS +#define OSS_MIX_ERRORS #define STDOUT_ERRORS #define FILE_WRITE_ERRORS #define STDIN_ERRORS @@ -44,15 +42,11 @@ extern const char **para_errlist[]; PARA_ERROR(SYNC_COMPLETE, "all buddies in sync"), \ PARA_ERROR(SYNC_LISTEN_FD, "no fd to listen on"), \ -#define OSS_MIX_ERRORS \ - PARA_ERROR(OSS_MIXER_CHANNEL, "invalid mixer channel"), \ - - #define ALSA_MIX_ERRORS \ PARA_ERROR(ALSA_MIX_OPEN, "could not open mixer"), \ - PARA_ERROR(ALSA_MIX_BAD_ELEM, "invalid/unsupported control element"), \ PARA_ERROR(ALSA_MIX_GET_VAL, "could not read control element state"), \ PARA_ERROR(ALSA_MIX_SET_VAL, "could not set control element state"), \ + PARA_ERROR(ALSA_MIX_RANGE, "value control element out of range"), \ #define RESAMPLE_FILTER_ERRORS \ @@ -83,12 +77,16 @@ extern const char **para_errlist[]; PARA_ERROR(NO_VALID_FILES, "no valid file found in playlist"), \ PARA_ERROR(BAD_PLAY_CMD, "invalid command"), \ +#define FADE_ERRORS \ + PARA_ERROR(BAD_CHANNEL, "invalid channel"), \ #define FLACDEC_FILTER_ERRORS \ PARA_ERROR(FLACDEC_DECODER_ALLOC, "could not allocate stream decoder"), \ PARA_ERROR(FLACDEC_DECODER_INIT, "could not init stream decoder"), \ PARA_ERROR(FLACDEC_EOF, "flacdec encountered end of file condition"), \ +#define GUI_ERRORS \ + PARA_ERROR(GUI_SIGCHLD, "received SIGCHLD"), \ #define FLAC_AFH_ERRORS \ PARA_ERROR(FLAC_CHAIN_ALLOC, "could not create metadata chain"), \ @@ -100,6 +98,8 @@ extern const char **para_errlist[]; PARA_ERROR(FLAC_SKIP_META, "could not skip metadata"), \ PARA_ERROR(FLAC_DECODE_POS, "could not get decode position"), \ PARA_ERROR(FLAC_STREAMINFO, "could not read stream info meta block"), \ + PARA_ERROR(FLAC_REPLACE_COMMENT, "could not replace vorbis comment"), \ + PARA_ERROR(FLAC_WRITE_CHAIN, "failed to write metadata chain"), \ #define AFH_RECV_ERRORS \ @@ -107,9 +107,11 @@ extern const char **para_errlist[]; #define OGG_AFH_COMMON_ERRORS \ - PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error (first packet)"), \ + PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error"), \ + PARA_ERROR(STREAM_PACKETIN, "ogg stream packet-in error"), \ PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \ - PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \ + PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error"), \ + PARA_ERROR(STREAM_PAGEOUT, "ogg stream page-out error"), \ PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \ PARA_ERROR(OGG_EMPTY, "no ogg pages found"), \ @@ -163,7 +165,6 @@ extern const char **para_errlist[]; #define PREBUFFER_FILTER_ERRORS \ - PARA_ERROR(PREBUFFER_SYNTAX, "syntax error in prebuffer filter config"), \ PARA_ERROR(PREBUFFER_SUCCESS, "prebuffering complete"), \ @@ -183,6 +184,7 @@ extern const char **para_errlist[]; PARA_ERROR(AO_PLAY, "ao_play() failed"), \ PARA_ERROR(AO_BAD_SAMPLE_FORMAT, "ao: unsigned sample formats not supported"), \ PARA_ERROR(AO_PTHREAD, "pthread error"), \ + PARA_ERROR(AO_EOF, "ao: end of file"), \ #define COMPRESS_FILTER_ERRORS \ @@ -211,7 +213,6 @@ extern const char **para_errlist[]; #define AMP_FILTER_ERRORS \ - PARA_ERROR(AMP_SYNTAX, "syntax error in amp filter config"), \ PARA_ERROR(AMP_ZERO_AMP, "no amplification necessary"), \ PARA_ERROR(AMP_EOF, "amp: end of file"), \ @@ -260,7 +261,6 @@ extern const char **para_errlist[]; #define BLOB_ERRORS \ PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \ - PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \ #define PLAYLIST_ERRORS \ @@ -270,7 +270,7 @@ extern const char **para_errlist[]; #define AFT_ERRORS \ - PARA_ERROR(BAD_AFSI, "invaiid afs info"), \ + PARA_ERROR(BAD_AFSI, "invalid afs info"), \ PARA_ERROR(LOCALTIME, "localtime() failed"), \ PARA_ERROR(STRFTIME, "strftime() failed"), \ PARA_ERROR(BAD_PATH, "invalid path"), \ @@ -279,6 +279,7 @@ extern const char **para_errlist[]; PARA_ERROR(NO_AFHI, "audio format handler info required"), \ PARA_ERROR(AFT_SYNTAX, "audio file table syntax error"), \ PARA_ERROR(HASH_MISMATCH, "hash mismatch, consider re-add"), \ + PARA_ERROR(NO_MATCH, "no matches"), \ #define USER_LIST_ERRORS \ @@ -302,7 +303,6 @@ extern const char **para_errlist[]; PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \ PARA_ERROR(NO_CONFIG, "config file not found"), \ PARA_ERROR(BAD_CONFIG, "syntax error in config file"), \ - PARA_ERROR(CLIENT_AUTH, "authentication failed"), \ PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \ PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \ PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \ @@ -344,6 +344,8 @@ extern const char **para_errlist[]; PARA_ERROR(NOT_PLAYING, "not playing"), \ PARA_ERROR(AUDIOD_OFF, "audiod switched off"), \ PARA_ERROR(STATUS_TIMEOUT, "status item timeout"), \ + PARA_ERROR(AUDIOD_SIGNAL, "caught deadly signal"), \ + PARA_ERROR(AUDIOD_TERM, "terminating on user request"), \ #define AUDIOD_COMMAND_ERRORS \ @@ -389,7 +391,6 @@ extern const char **para_errlist[]; #define STRING_ERRORS \ PARA_ERROR(ATOI_OVERFLOW, "value too large"), \ - PARA_ERROR(STRTOLL, "unknown strtoll error"), \ PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \ PARA_ERROR(ATOI_JUNK_AT_END, "further characters after number"), \ PARA_ERROR(SIZE_PREFIX, "bad size prefix"), \ @@ -407,13 +408,17 @@ extern const char **para_errlist[]; PARA_ERROR(MP3_INFO, "could not read mp3 info"), \ PARA_ERROR(HEADER_FREQ, "invalid header frequency"), \ PARA_ERROR(HEADER_BITRATE, "invalid header bitrate"), \ - + PARA_ERROR(ID3_DETACH, "could not detach id3 frame"), \ + PARA_ERROR(ID3_ATTACH, "could not atttach id3 frame"), \ + PARA_ERROR(ID3_SETENCODING, "could not set id3 text encoding field"), \ + PARA_ERROR(ID3_SETSTRING, "could not set id3 string field"), \ #define AAC_AFH_ERRORS \ PARA_ERROR(STSZ, "did not find stcz atom"), \ PARA_ERROR(MP4ASC, "audio spec config error"), \ PARA_ERROR(AAC_AFH_INIT, "failed to init aac decoder"), \ - + PARA_ERROR(MP4V2, "mp4v2 library error"), \ + PARA_ERROR(NO_AUDIO_TRACK, "file contains no valid audio track"), \ #define AAC_COMMON_ERRORS \ PARA_ERROR(ESDS, "did not find esds atom"), \ @@ -422,6 +427,7 @@ extern const char **para_errlist[]; #define OGG_AFH_ERRORS \ PARA_ERROR(VORBIS, "vorbis synthesis header-in error (not vorbis?)"), \ + PARA_ERROR(VORBIS_COMMENTHEADER, "could not create vorbis comment header"), \ PARA_ERROR(OGG_PACKET_IN, "ogg_stream_packetin() failed"), \ PARA_ERROR(OGG_STREAM_FLUSH, "ogg_stream_flush() failed"), \ @@ -499,7 +505,6 @@ extern const char **para_errlist[]; PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \ PARA_ERROR(AAC_DECODE, "aac decode error"), \ - #define CHUNK_QUEUE_ERRORS \ PARA_ERROR(QUEUE, "packet queue overrun"), \ @@ -582,7 +587,7 @@ extern const char **para_errlist[]; * \return True if \a num is paraslash's representation of the system * error identified by \a _errno. */ -_static_inline_ int is_errno(int num, int _errno) +_static_inline_ bool is_errno(int num, int _errno) { assert(num > 0 && _errno > 0); return ERRNO_TO_PARA_ERROR(_errno) == num; @@ -627,9 +632,9 @@ _static_inline_ int osl(int ret) /** * 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). + * + * 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, ss ## _ERRORS}