X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/bb6ae3fb80fff36cd342d6f6bff3dfabd7dd243e..d22b8a59995829bc14b4490b9bddd95346e0585d:/lib/configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index d212a7a..4b22fdb 100644
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -177,18 +177,30 @@ 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;
+
+/* 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 */
 
+#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;
 
@@ -226,6 +238,9 @@ struct config {
   /** @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 */
@@ -261,6 +276,15 @@ struct config {
 
   /** @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;
+
+  /** @brief Whether to allow user management over TCP */
+  int remote_userman;
   
   /* derived values: */
   int nparts;				/* number of distinct name parts */