X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/637fdea366a8a87024322d283eba89067a403493..63ad732fd2031c8775ddf98cd538c8759c4537df:/lib/configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index e9893f0..02c953a 100644
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -102,6 +102,9 @@ struct config {
   /** @brief All players */
   struct stringlistlist player;
 
+  /** @brief All tracklength plugins */
+  struct stringlistlist tracklength;
+
   /** @brief Allowed users */
   struct stringlistlist allow;
 
@@ -114,6 +117,9 @@ struct config {
   /** @brief Maximum number of recent tracks to record in history */
   long history;
 
+  /** @brief Expiry limit for noticed.db */
+  long noticed_history;
+  
   /** @brief Trusted users */
   struct stringlist trust;
 
@@ -179,6 +185,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;
@@ -198,6 +206,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;
 
@@ -232,15 +243,21 @@ struct config {
   /** @brief TTL for multicast packets */
   long multicast_ttl;
 
+  /** @brief Whether to loop back multicast packets */
+  int multicast_loop;
+  
   /* derived values: */
   int nparts;				/* number of distinct name parts */
   char **parts;				/* name part list  */
+
+  /* undocumented, for testing only */
+  long dbversion;
 };
 
 extern struct config *config;
 /* the current configuration */
 
-int config_read(void);
+int config_read(int server);
 /* re-read config, return 0 on success or non-0 on error.
  * Only updates @config@ if the new configuration is valid. */
 
@@ -260,6 +277,7 @@ char *config_private(void);
 /* get the private config file */
 
 extern char *configfile;
+extern int config_per_user;
 
 #endif /* CONFIGURATION_H */