Put a frame around user management window (and the other popups) and

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index d212a7ac80d017ba350561f2c614416875c011c4..de251970855cc103316b2f503bf192e0dc6528ff 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
 /*
  * 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
  *
  * 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


@@ -177,12 +177,12 @@ struct config {
   /** @brief Sox syntax generation */
   long sox_generation;
 
   /** @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.
    */
    *
    * 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_ALSA 0                 /**< Use ALSA (Linux only) */
 #define BACKEND_COMMAND 1              /**< Execute a command */
 #define BACKEND_NETWORK 2              /**< Transmit RTP  */


@@ -226,6 +226,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 */


@@ -261,6 +264,12 @@ struct config {
 
   /** @brief Origin address for outbound mail */
   char *mail_sender;
 
   /** @brief Origin address for outbound mail */
   char *mail_sender;

+
+  /** @brief Maximum number of tracks in response to 'new' */
+  long new_max;
+
+  /** @brief Minimum interval between password reminder emails */
+  long reminder_interval;

   
   /* derived values: */
   int nparts;                          /* number of distinct name parts */
   
   /* derived values: */
   int nparts;                          /* number of distinct name parts */