Update some copyright dates.

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index e4ac7b93568de92d5a0b2403346ce614abe93778..c5cf198f46957cb984ff902752230aa589bec766 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2004-2008 Richard Kettlewell
  *
  * 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
@@ -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;
 
@@ -173,16 +177,17 @@ struct config {
   /** @brief Sox syntax generation */
   long sox_generation;
 
-  /** @brief Speaker backend
+  /** @brief API used to play sound
    *
    * Choices are @ref BACKEND_ALSA, @ref BACKEND_COMMAND or @ref
    * BACKEND_NETWORK.
    */
-  int speaker_backend;
+  int api;
 #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;
@@ -200,7 +205,10 @@ struct config {
   struct stringlist templates;
 
   /** @brief Canonical URL of web interface */
-  const char *url;
+  char *url;
+
+  /** @brief Short display limit */
+  long short_display;
 
   /** @brief Maximum refresh interval for web interface (seconds) */
   long refresh;
@@ -236,9 +244,33 @@ 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 */
+  char *default_rights;
+
+  /** @brief SMTP server for sending mail */
+  char *smtp_server;
+
+  /** @brief Origin address for outbound mail */
+  char *mail_sender;
+
+  /** @brief Maximum number of tracks in response to 'new' */
+  long new_max;
+  
   /* derived values: */
   int nparts;                          /* number of distinct name parts */
   char **parts;                                /* name part list  */
+
+  /* undocumented, for testing only */
+  long dbversion;
 };
 
 extern struct config *config;
@@ -264,6 +296,7 @@ char *config_private(void);
 /* get the private config file */
 
 extern char *configfile;
+extern int config_per_user;
 
 #endif /* CONFIGURATION_H */