Unify sound API configuration.

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index f08b866e26fb46166a03ab374ebc84f7a10646ce..f965bbd972a8f8232dc3f3b27311243387e88316 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -177,12 +177,12 @@ 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  */
@@ -205,7 +205,7 @@ struct config {
   struct stringlist templates;
 
   /** @brief Canonical URL of web interface */
-  const char *url;
+  char *url;
 
   /** @brief Short display limit */
   long short_display;
@@ -254,7 +254,13 @@ struct config {
   long cookie_key_lifetime;
 
   /** @brief Default rights for a new user */
-  rights_type default_rights;
+  char *default_rights;
+
+  /** @brief SMTP server for sending mail */
+  char *smtp_server;
+
+  /** @brief Origin address for outbound mail */
+  char *mail_sender;
   
   /* derived values: */
   int nparts;                          /* number of distinct name parts */