Fiddle with CSS+HTML in effort to get more consistent buttons

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index 93885689f8cfee7270f4a574fde985634edb5e65..cc7e1e3756b6d54478795ba90c4d518e3fda620c 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -1,3 +1,4 @@
+

 /*
  * This file is part of DisOrder.
  * Copyright (C) 2004-2008 Richard Kettlewell
 /*
  * This file is part of DisOrder.
  * Copyright (C) 2004-2008 Richard Kettlewell


@@ -24,11 +25,11 @@
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 

+#include <pcre.h>
+

 #include "speaker-protocol.h"
 #include "rights.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.
  */
 /* 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 namepart {
   char *part;                          /* part */

-  struct real_pcre *re;                        /* regexp */
+  pcre *re;                            /* regexp */

   char *replace;                       /* replacement string */
   char *context;                       /* context glob */
   unsigned reflags;                    /* regexp flags */
   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 */
   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 */
 };
 
   unsigned flags;                      /* regexp flags */
 };
 


@@ -183,12 +184,24 @@ struct config {
    * BACKEND_NETWORK.
    */
   int api;
    * 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  */
 #define BACKEND_COREAUDIO 3            /**< Use Core Audio (Mac only) */
 #define BACKEND_OSS 4                  /**< Use OSS */
 
 #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 */
 

+#if HAVE_ALSA_ASOUNDLIB_H
+# define DEFAULT_BACKEND BACKEND_ALSA
+#elif HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
+# define DEFAULT_BACKEND BACKEND_OSS
+#elif HAVE_COREAUDIO_AUDIOHARDWARE_H
+# define DEFAULT_BACKEND BACKEND_COREAUDIO
+#else
+# error Cannot choose a default backend
+#endif
+

   /** @brief Home directory for state files */
   const char *home;
 
   /** @brief Home directory for state files */
   const char *home;
 


@@ -226,6 +239,9 @@ struct config {
   /** @brief Target queue length */
   long queue_pad;
 
   /** @brief Target queue length */
   long queue_pad;
 

+  /** @brief Minimum time between a track being played again */
+  long replay_min;
+  

   struct namepartlist namepart;                /* transformations */
 
   /** @brief Termination signal for subprocesses */
   struct namepartlist namepart;                /* transformations */
 
   /** @brief Termination signal for subprocesses */


@@ -256,6 +272,9 @@ struct config {
   /** @brief Default rights for a new user */
   char *default_rights;
 
   /** @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;
 
   /** @brief SMTP server for sending mail */
   char *smtp_server;
 


@@ -267,6 +286,15 @@ struct config {
 
   /** @brief Minimum interval between password reminder emails */
   long reminder_interval;
 
   /** @brief Minimum interval between password reminder emails */
   long reminder_interval;

+
+  /** @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 */
   
   /* derived values: */
   int nparts;                          /* number of distinct name parts */