/*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
*
* 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
SS_CRYPT,
SS_HTTP_SEND,
SS_ORTP_SEND,
- SS_DB,
+ SS_AFS,
SS_OGG_AFH,
SS_MP3_AFH,
SS_AAC_AFH,
SS_AACDEC,
SS_AAC_COMMON,
SS_SERVER,
- SS_AFS,
+ SS_VSS,
SS_MYSQL_SELECTOR,
SS_IPC,
SS_DCCP,
SS_ALSA_WRITE,
SS_FILE_WRITE,
SS_OSX_WRITE,
+ SS_USER_LIST,
NUM_SS
};
extern const char **para_errlist[];
/** \endcond */
+#define USER_LIST_ERRORS \
+ PARA_ERROR(USERLIST, "failed to open user list file"), \
+
+
#define OSX_WRITE_ERRORS \
PARA_ERROR(STREAM_FORMAT, "could not set stream format"), \
PARA_ERROR(ADD_CALLBACK, "can not add callback"), \
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 \
#define MP3_AFH_ERRORS \
- PARA_ERROR(FREAD, "fread error"), \
- PARA_ERROR(FSEEK, "fseek error"), \
PARA_ERROR(FRAME, "invalid mp3 frame"), \
PARA_ERROR(FRAME_LENGTH, "invalid frame length"), \
PARA_ERROR(MP3_NO_FILE, "invalid mp3 file pointer"), \
PARA_ERROR(OGG_REPOS, "ogg repositioning error"), \
-#define AFS_ERRORS \
+#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"), \
-#define DB_ERRORS \
+#define AFS_ERRORS \
PARA_ERROR(GETCWD, "can not get current working directory"), \
PARA_ERROR(CHDIR, "can not change directory"), \
PARA_ERROR(OPENDIR, "can not open directory"), \
PARA_ERROR(NO_AUDIO_FILE, "no audio file"), \
PARA_ERROR(BAD_CMD, "invalid command"), \
PARA_ERROR(PERM, "permission denied"), \
- PARA_ERROR(USERLIST, "failed to open user list file"), \
- PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
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"), \
#define FD_ERRORS \
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 \
*/
#define PARA_ERROR(err, msg) E_ ## err
-#define SS_NAME(ss) para_errlist[ss]? para_errlist[ss][0] : ""
+// #define SS_NAME(ss) para_errlist[ss]? para_errlist[ss][0] : ""
/** \cond popcorn time */
SS_ENUM(GUI);
SS_ENUM(AAC_AFH);
SS_ENUM(AAC_COMMON);
SS_ENUM(SERVER);
-SS_ENUM(AFS);
+SS_ENUM(VSS);
SS_ENUM(COMMAND);
SS_ENUM(RANDOM_SELECTOR);
SS_ENUM(PLAYLIST_SELECTOR);
SS_ENUM(CRYPT);
SS_ENUM(HTTP_SEND);
SS_ENUM(ORTP_SEND);
-SS_ENUM(DB);
+SS_ENUM(AFS);
SS_ENUM(MYSQL_SELECTOR);
SS_ENUM(IPC);
SS_ENUM(DCCP);
SS_ENUM(CLIENT);
SS_ENUM(CLIENT_COMMON);
SS_ENUM(AUDIOC);
+SS_ENUM(USER_LIST);
/** \endcond */
#undef PARA_ERROR
/* rest of the world only sees the error text */