X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=c28a25a39bf7da44bfb20d330765912d8912ba6b;hp=ba8409dfff4e42375629ba50f8a99281ac1aa574;hb=97ad8ac8735dfd7a514aa66e9de54f253440c17d;hpb=08ae151a088d1a1bc5442d8ee95960353a7a5782 diff --git a/error.h b/error.h index ba8409df..c28a25a3 100644 --- a/error.h +++ b/error.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 Andre Noll + * Copyright (C) 2006-2014 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 @@ -87,6 +85,8 @@ extern const char **para_errlist[]; 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"), \ @@ -343,6 +343,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 \