X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/6961095b797229842e1465ff3670625d11e95167..64370837e6201342a0f41f84aaf0ce106a8635d0:/lib/configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index 63c82c8..08304be 100644
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -112,24 +112,15 @@ struct config {
   /** @brief All tracklength plugins */
   struct stringlistlist tracklength;
 
-  /** @brief Allowed users */
-  struct stringlistlist allow;
-
   /** @brief Scratch tracks */
   struct stringlist scratch;
 
-  /** @brief Gap between tracks in seconds */
-  long gap;
-
   /** @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;
-
   /** @brief User for server to run as */
   const char *user;
 
@@ -157,17 +148,12 @@ struct config {
   /** @brief Mixer channel to use */
   char *channel;
 
-  long prefsync;			/* preflog sync interval */
-
   /** @brief Secondary listen address */
   struct netaddress listen;
 
   /** @brief Alias format string */
   const char *alias;
 
-  /** @brief Enable server locking */
-  int lock;
-
   /** @brief Nice value for server */
   long nice_server;
 
@@ -222,16 +208,6 @@ struct config {
   /** @brief Minimum refresh interval for web interface (seconds) */
   long refresh_min;
 
-  /** @brief Facilities restricted to trusted users
-   *
-   * A bitmap of @ref RESTRICT_SCRATCH, @ref RESTRICT_REMOVE and @ref
-   * RESTRICT_MOVE.
-   */
-  unsigned restrictions;		/* restrictions */
-#define RESTRICT_SCRATCH 1		/**< Restrict scratching */
-#define RESTRICT_REMOVE 2		/**< Restrict removal */
-#define RESTRICT_MOVE 4			/**< Restrict rearrangement */
-
   /** @brief Target queue length */
   long queue_pad;
 
@@ -301,6 +277,9 @@ struct config {
   /** @brief Rescan on (un)mount */
   int mount_rescan;
 
+  /** @brief RTP mode */
+  const char *rtp_mode;
+
   /* derived values: */
   int nparts;				/* number of distinct name parts */
   char **parts;				/* name part list  */