X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=c0888aa0c4050f91b131279ad5c943a98b5a7acf;hp=318448666fb4ea30a7835858b205a60ba89936b5;hb=bd38899d7d8cd4043bfee85fcdb55159ca5ba1a2;hpb=df3c03e72911edb31e7f1e32ebe29dad063e3b70 diff --git a/error.h b/error.h index 31844866..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 }; @@ -287,6 +276,7 @@ extern const char **para_errlist[]; #define VSS_ERRORS \ PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ + PARA_ERROR(CHUNK, "unable to get chunk"), \ #define AFS_ERRORS \ @@ -306,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 \ @@ -432,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 * @@ -560,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 */