X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/3c499fe72ea3c8527663a4fb7df9f6d627fc42b7..b0b15b7ced28b3c6ddfcd4b0a7e46ee6432a243c:/lib/configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index a06524c..cc7e1e3 100644
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -1,3 +1,4 @@
+
 /*
  * This file is part of DisOrder.
  * Copyright (C) 2004-2008 Richard Kettlewell
@@ -24,11 +25,11 @@
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
+#include <pcre.h>
+
 #include "speaker-protocol.h"
 #include "rights.h"
 
-struct real_pcre;
-
 /* Configuration is kept in a @struct config@; the live configuration
  * is always pointed to by @config@.  Values in @config@ are UTF-8 encoded.
  */
@@ -69,7 +70,7 @@ struct collectionlist {
 
 struct namepart {
   char *part;				/* part */
-  struct real_pcre *re;			/* regexp */
+  pcre *re;				/* regexp */
   char *replace;			/* replacement string */
   char *context;			/* context glob */
   unsigned reflags;			/* regexp flags */
@@ -84,7 +85,7 @@ struct transform {
   char *type;				/* track or dir */
   char *context;			/* sort or choose */
   char *replace;			/* substitution string */
-  struct real_pcre *re;			/* compiled re */
+  pcre *re;				/* compiled re */
   unsigned flags;			/* regexp flags */
 };
 
@@ -183,6 +184,8 @@ struct config {
    * BACKEND_NETWORK.
    */
   int api;
+
+/* These values had better be non-negative */
 #define BACKEND_ALSA 0			/**< Use ALSA (Linux only) */
 #define BACKEND_COMMAND 1		/**< Execute a command */
 #define BACKEND_NETWORK 2		/**< Transmit RTP  */
@@ -269,6 +272,9 @@ struct config {
   /** @brief Default rights for a new user */
   char *default_rights;
 
+  /** @brief Path to sendmail executable */
+  char *sendmail;
+
   /** @brief SMTP server for sending mail */
   char *smtp_server;
 
@@ -283,6 +289,12 @@ struct config {
 
   /** @brief Whether to allow user management over TCP */
   int remote_userman;
+
+  /** @brief Maximum age of biased-up tracks */
+  long new_bias_age;
+
+  /** @brief Maximum bias */
+  long new_bias;
   
   /* derived values: */
   int nparts;				/* number of distinct name parts */