X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=de5dacf298667a9ccaf5708f921ddabcc8baf95b;hp=5db5e1749a5d915dc3f55f956c423399613da7bf;hb=e4db7671a91a7552c642acc979f0eb278f8d467f;hpb=90560de0d7e4d825772270f9ac7cbefbb38aad97 diff --git a/error.h b/error.h index 5db5e174..de5dacf2 100644 --- a/error.h +++ b/error.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2010 Andre Noll + * Copyright (C) 2006-2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -103,7 +103,6 @@ extern const char **para_errlist[]; PARA_ERROR(BAD_SAMPLE_FORMAT, "sample format not supported"), \ PARA_ERROR(BAD_CHANNEL_COUNT, "channel count not supported"), \ PARA_ERROR(BAD_SAMPLERATE, "sample rate not supported"), \ - PARA_ERROR(OSS_EOF, "oss: end of file"), \ #define COMPRESS_FILTER_ERRORS \ @@ -230,10 +229,8 @@ extern const char **para_errlist[]; #define SCHED_ERRORS \ - PARA_ERROR(TASK_KILLED, "task killed"), \ - PARA_ERROR(TASK_UNREGISTERED, "task has been unscheduled"), \ - PARA_ERROR(NO_SUCH_TASK, "task not found"), \ PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \ + PARA_ERROR(SCHED_SHUTDOWN, "scheduler was shut down"), \ #define NET_ERRORS \ @@ -243,6 +240,7 @@ extern const char **para_errlist[]; PARA_ERROR(SENDMSG, "sendmsg() failed"), \ PARA_ERROR(RECVMSG, "recvmsg() failed"), \ PARA_ERROR(SCM_CREDENTIALS, "did not receive SCM credentials"), \ + PARA_ERROR(MAKESOCK, "makesock error"), \ #define UDP_RECV_ERRORS \ @@ -350,6 +348,8 @@ extern const char **para_errlist[]; #define OGG_AFH_ERRORS \ PARA_ERROR(VORBIS, "vorbis synthesis header-in error (not vorbis?)"), \ + PARA_ERROR(OGG_PACKET_IN, "ogg_stream_packetin() failed"), \ + PARA_ERROR(OGG_STREAM_FLUSH, "ogg_stream_flush() failed"), \ #define VSS_ERRORS \ @@ -411,12 +411,11 @@ extern const char **para_errlist[]; PARA_ERROR(SET_RATE, "snd_pcm_hw_params_set_rate_near failed"), \ PARA_ERROR(START_THRESHOLD, "snd_pcm_sw_params_set_start_threshold() failed"), \ PARA_ERROR(STOP_THRESHOLD, "snd_pcm_sw_params_set_stop_threshold() failed"), \ - PARA_ERROR(ALSA_EOF, "alsa: end of file"), \ - #define WRITE_COMMON_ERRORS \ PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \ + PARA_ERROR(WRITE_COMMON_EOF, "end of file"), \ #define AACDEC_FILTER_ERRORS \