X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=c28a25a39bf7da44bfb20d330765912d8912ba6b;hp=0f542a832cbe7cf07502ce4501749ffd72b71ba9;hb=edf7c2476f6c8dcc6a9f5a1dbcfbcdc59104f462;hpb=a99d213561de016b3d7a0d54f1a6678379d32ee3 diff --git a/error.h b/error.h index 0f542a83..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. */ @@ -19,7 +19,6 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define GUI_THEME_ERRORS #define RINGBUFFER_ERRORS #define SCORE_ERRORS -#define RBTREE_ERRORS #define RECV_ERRORS #define IPC_ERRORS #define DCCP_SEND_ERRORS @@ -182,6 +181,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 \ @@ -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 \