register/confirm commands, and tests, and docs

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index 476a917a33391e36f6ebc0a0b0064db0bf7f830f..f08b866e26fb46166a03ab374ebc84f7a10646ce 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -25,6 +25,7 @@
 #define CONFIGURATION_H
 
 #include "speaker-protocol.h"
+#include "rights.h"
 
 struct real_pcre;
 
@@ -102,6 +103,9 @@ struct config {
   /** @brief All players */
   struct stringlistlist player;
 
+  /** @brief All tracklength plugins */
+  struct stringlistlist tracklength;
+
   /** @brief Allowed users */
   struct stringlistlist allow;
 
@@ -182,6 +186,8 @@ struct config {
 #define BACKEND_ALSA 0                 /**< Use ALSA (Linux only) */
 #define BACKEND_COMMAND 1              /**< Execute a command */
 #define BACKEND_NETWORK 2              /**< Transmit RTP  */
+#define BACKEND_COREAUDIO 3            /**< Use Core Audio (Mac only) */
+#define BACKEND_OSS 4                  /**< Use OSS */
 
   /** @brief Home directory for state files */
   const char *home;
@@ -201,6 +207,9 @@ struct config {
   /** @brief Canonical URL of web interface */
   const char *url;
 
+  /** @brief Short display limit */
+  long short_display;
+
   /** @brief Maximum refresh interval for web interface (seconds) */
   long refresh;
 
@@ -235,9 +244,24 @@ struct config {
   /** @brief TTL for multicast packets */
   long multicast_ttl;
 
+  /** @brief Whether to loop back multicast packets */
+  int multicast_loop;
+
+  /** @brief Login lifetime in seconds */
+  long cookie_login_lifetime;
+
+  /** @brief Signing key lifetime in seconds */
+  long cookie_key_lifetime;
+
+  /** @brief Default rights for a new user */
+  rights_type default_rights;
+  
   /* derived values: */
   int nparts;                          /* number of distinct name parts */
   char **parts;                                /* name part list  */
+
+  /* undocumented, for testing only */
+  long dbversion;
 };
 
 extern struct config *config;
@@ -263,6 +287,7 @@ char *config_private(void);
 /* get the private config file */
 
 extern char *configfile;
+extern int config_per_user;
 
 #endif /* CONFIGURATION_H */