Merge ../paraslash.fml/paraslash

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 05efb790aab78184c58e23829603270e41392ca6..9563303fabf9e3aca1556f34180a50753ca9d16e 100644 (file)
--- a/error.h
+++ b/error.h
@@ -1,5 +1,5 @@
 /*
 /*

- * 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
  *
  *     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


@@ -63,7 +63,7 @@ enum para_subsystem {
        SS_AACDEC,
        SS_AAC_COMMON,
        SS_SERVER,
        SS_AACDEC,
        SS_AAC_COMMON,
        SS_SERVER,

-       SS_AFS,
+       SS_VSS,

        SS_MYSQL_SELECTOR,
        SS_IPC,
        SS_DCCP,
        SS_MYSQL_SELECTOR,
        SS_IPC,
        SS_DCCP,


@@ -74,6 +74,7 @@ enum para_subsystem {
        SS_ALSA_WRITE,
        SS_FILE_WRITE,
        SS_OSX_WRITE,
        SS_ALSA_WRITE,
        SS_FILE_WRITE,
        SS_OSX_WRITE,

+       SS_USER_LIST,

        NUM_SS
 };
 
        NUM_SS
 };
 


@@ -94,6 +95,11 @@ enum para_subsystem {
 extern const char **para_errlist[];
 /** \endcond */
 
 extern const char **para_errlist[];
 /** \endcond */
 

+#define USER_LIST_ERRORS \
+       PARA_ERROR(USERLIST, "failed to open user list file"), \
+       PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
+
+

 #define OSX_WRITE_ERRORS \
        PARA_ERROR(STREAM_FORMAT, "could not set stream format"), \
        PARA_ERROR(ADD_CALLBACK, "can not add callback"), \
 #define OSX_WRITE_ERRORS \
        PARA_ERROR(STREAM_FORMAT, "could not set stream format"), \
        PARA_ERROR(ADD_CALLBACK, "can not add callback"), \


@@ -294,7 +300,7 @@ extern const char **para_errlist[];
        PARA_ERROR(OGG_REPOS, "ogg repositioning error"), \
 
 
        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(AUDIO_FORMAT, "audio format not recognized"), \
        PARA_ERROR(FSTAT, "failed to fstat() audio file"), \
 


@@ -354,8 +360,6 @@ extern const char **para_errlist[];
        PARA_ERROR(NO_AUDIO_FILE, "no audio file"), \
        PARA_ERROR(BAD_CMD, "invalid command"), \
        PARA_ERROR(PERM, "permission denied"), \
        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"), \
        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"), \


@@ -548,7 +552,7 @@ SS_ENUM(OGG_AFH);
 SS_ENUM(AAC_AFH);
 SS_ENUM(AAC_COMMON);
 SS_ENUM(SERVER);
 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(COMMAND);
 SS_ENUM(RANDOM_SELECTOR);
 SS_ENUM(PLAYLIST_SELECTOR);


@@ -571,6 +575,7 @@ SS_ENUM(RINGBUFFER);
 SS_ENUM(CLIENT);
 SS_ENUM(CLIENT_COMMON);
 SS_ENUM(AUDIOC);
 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 */
 /** \endcond */
 #undef PARA_ERROR
 /* rest of the world only sees the error text */