X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=c0888aa0c4050f91b131279ad5c943a98b5a7acf;hp=732a5470c5c6f928131ec4721c6dbf90a5ddf3e2;hb=1404c0dbc7265e42ac81fc1664c724630c3454e4;hpb=25e6054e929908d9e21a2dd39996117e93124da5 diff --git a/error.h b/error.h index 732a5470..c0888aa0 100644 --- a/error.h +++ b/error.h @@ -1,19 +1,7 @@ /* * Copyright (C) 2006-2007 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file error.h list of error messages for all subsystems */ @@ -75,6 +63,7 @@ enum para_subsystem { SS_FILE_WRITE, SS_OSX_WRITE, SS_USER_LIST, + SS_CHUNK_QUEUE, NUM_SS }; @@ -102,7 +91,6 @@ extern const char **para_errlist[]; #define OSX_WRITE_ERRORS \ PARA_ERROR(STREAM_FORMAT, "could not set stream format"), \ PARA_ERROR(ADD_CALLBACK, "can not add callback"), \ - PARA_ERROR(READ_STDIN, "failed to read from stdin"), \ PARA_ERROR(OPEN_COMP, "OpenAComponent() error"), \ PARA_ERROR(UNIT_INIT, "AudioUnitInitialize() error"), \ PARA_ERROR(UNIT_START, "AudioUnitStart() error"), \ @@ -119,7 +107,6 @@ extern const char **para_errlist[]; - #define CLIENT_COMMON_ERRORS \ PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \ PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \ @@ -174,27 +161,22 @@ extern const char **para_errlist[]; #define HTTP_RECV_ERRORS \ - PARA_ERROR(SEND_HTTP_REQUEST, "failed to send http request"), \ - PARA_ERROR(MISSING_OK, "did not receive OK message from peer"), \ - PARA_ERROR(HTTP_RECV_BUF, "did not receive buffer"), \ PARA_ERROR(HTTP_RECV_EOF, "http_recv: end of file"), \ + PARA_ERROR(HTTP_RECV_OVERRUN, "http_recv: outout buffer overrun"), \ #define RECV_ERRORS \ - PARA_ERROR(RECV_SELECT, "recv select error"), \ - PARA_ERROR(WRITE_STDOUT, "stdout write error"), \ + PARA_ERROR(RECV_SYNTAX, "recv syntax error"), \ #define RECV_COMMON_ERRORS \ - PARA_ERROR(RECV_SYNTAX, "recv syntax error"), \ #define AUDIOD_ERRORS \ - PARA_ERROR(WRITE_AUDIO_DATA, "failed to write audio data"), \ PARA_ERROR(NO_MORE_SLOTS, "no more empty slots"), \ PARA_ERROR(MISSING_COLON, "syntax error: missing colon"), \ PARA_ERROR(UNSUPPORTED_AUDIO_FORMAT, "given audio format not supported"), \ - PARA_ERROR(STATUS_EOF, "server closed status connection"), \ + PARA_ERROR(SIGNAL_CAUGHT, "caught signal"), \ #define AUDIOD_COMMAND_ERRORS \ @@ -202,7 +184,6 @@ extern const char **para_errlist[]; PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \ PARA_ERROR(UCRED_PERM, "permission denied"), \ PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \ - PARA_ERROR(BAD_USER, "you don't exist. Go away."), \ #define FILTER_CHAIN_ERRORS \ @@ -250,7 +231,6 @@ extern const char **para_errlist[]; PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \ PARA_ERROR(WAITPID, "waitpid error"), \ PARA_ERROR(SIGNAL_PIPE, "failed to setup signal pipe"), \ - PARA_ERROR(SIGNAL_CAUGHT, "caught signal"), \ #define STRING_ERRORS \ @@ -266,9 +246,7 @@ extern const char **para_errlist[]; #define MP3_AFH_ERRORS \ PARA_ERROR(FRAME, "invalid mp3 frame"), \ PARA_ERROR(FRAME_LENGTH, "invalid frame length"), \ - PARA_ERROR(MP3_NO_FILE, "invalid mp3 file pointer"), \ PARA_ERROR(MP3_INFO, "could not read mp3 info"), \ - PARA_ERROR(MP3_REPOS, "mp3 repositioning error"), \ PARA_ERROR(HEADER_FREQ, "invalid header frequency"), \ PARA_ERROR(HEADER_BITRATE, "invalid header bitrate"), \ @@ -276,6 +254,7 @@ extern const char **para_errlist[]; #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"), \ #define AAC_COMMON_ERRORS \ @@ -289,16 +268,15 @@ extern const char **para_errlist[]; PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \ PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error (first packet)"), \ PARA_ERROR(VORBIS, "vorbis synthesis header-in error (not vorbis?)"), \ - PARA_ERROR(OGG_NO_FILE, "invalid ogg file pointer"), \ - PARA_ERROR(OGG_OPEN, "ov_open error"), \ PARA_ERROR(OGG_INFO, "ov_info error"), \ - PARA_ERROR(OGG_REPOS, "ogg repositioning error"), \ + PARA_ERROR(OGG_VERSION, "unsupported ogg version"), \ + PARA_ERROR(OGG_BAD_HEADER, "invalid ogg vorbis header"), \ + PARA_ERROR(OGG_UNKNOWN_ERROR, "unknown ogg vorbis error"), \ #define VSS_ERRORS \ PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ - PARA_ERROR(FSTAT, "failed to fstat() audio file"), \ - PARA_ERROR(EMPTY_CHUNK, "empty chunk"), \ + PARA_ERROR(CHUNK, "unable to get chunk"), \ #define AFS_ERRORS \ @@ -318,8 +296,8 @@ extern const char **para_errlist[]; #define HTTP_SEND_ERRORS \ - PARA_ERROR(QUEUE, "packet queue overrun"), \ PARA_ERROR(WRITE_OK, "can not check whether fd is writable"), \ + PARA_ERROR(SEND_QUEUED_CHUNK, "failed to send queued chunk"), \ #define RANDOM_SELECTOR_ERRORS \ @@ -359,6 +337,7 @@ extern const char **para_errlist[]; PARA_ERROR(LOCK, "lock error"), \ PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \ PARA_ERROR(SERVER_CRASH, "para_server crashed -- can not live without it"), \ + PARA_ERROR(BAD_USER, "you don't exist. Go away."), \ #define PLAYLIST_SELECTOR_ERRORS \ @@ -376,13 +355,13 @@ extern const char **para_errlist[]; #define DCCP_ERRORS \ PARA_ERROR(DCCP_SOCKET, "can not create dccp socket"), \ - PARA_ERROR(DCCP_RECV_EOF, "dccp_recv: end of file"), \ #define DCCP_RECV_ERRORS \ PARA_ERROR(ADDR_INFO, "getaddrinfo error"), \ PARA_ERROR(DCCP_OVERRUN, "dccp output buffer buffer overrun"), \ PARA_ERROR(DCCP_CONNECT, "dccp connect error"), \ + PARA_ERROR(DCCP_RECV_EOF, "dccp_recv: end of file"), \ #define DCCP_SEND_ERRORS \ @@ -395,8 +374,6 @@ extern const char **para_errlist[]; PARA_ERROR(F_GETFL, "failed to get fd flags"), \ PARA_ERROR(F_SETFL, "failed to set fd flags"), \ PARA_ERROR(FGETS, "fgets error"), \ - PARA_ERROR(FSEEK, "fseek error"), \ - PARA_ERROR(FREAD, "fread error"), \ #define WRITE_ERRORS \ @@ -445,6 +422,10 @@ extern const char **para_errlist[]; PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \ +#define CHUNK_QUEUE_ERRORS \ + PARA_ERROR(QUEUE, "packet queue overrun"), \ + + /** * the subsystem shift * @@ -573,6 +554,7 @@ SS_ENUM(CLIENT); SS_ENUM(CLIENT_COMMON); SS_ENUM(AUDIOC); SS_ENUM(USER_LIST); +SS_ENUM(CHUNK_QUEUE); /** \endcond */ #undef PARA_ERROR /* rest of the world only sees the error text */