X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/23205f9cdd229343a83d8c5a6317d9187e90c3d4..349b7b74df53fe1631a269f4cd4e87951cfe9397:/lib/configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index eabbcce..4ef7862 100644
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -24,7 +24,7 @@
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
-#include <ao/ao.h>
+#include "speaker-protocol.h"
 
 struct real_pcre;
 
@@ -96,9 +96,15 @@ struct transformlist {
 struct config {
   /* server config */
 
+  /** @brief Authorization algorithm */
+  char *authorization_algorithm;
+  
   /** @brief All players */
   struct stringlistlist player;
 
+  /** @brief All tracklength plugins */
+  struct stringlistlist tracklength;
+
   /** @brief Allowed users */
   struct stringlistlist allow;
 
@@ -111,6 +117,9 @@ struct config {
   /** @brief Maximum number of recent tracks to record in history */
   long history;
 
+  /** @brief Expiry limit for noticed.db */
+  long noticed_history;
+  
   /** @brief Trusted users */
   struct stringlist trust;
 
@@ -162,7 +171,7 @@ struct config {
   const char *speaker_command;
 
   /** @brief Target sample format */
-  ao_sample_format sample_format;
+  struct stream_header sample_format;
 
   /** @brief Sox syntax generation */
   long sox_generation;
@@ -176,6 +185,8 @@ struct config {
 #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 */
 
   /** @brief Home directory for state files */
   const char *home;
@@ -195,6 +206,9 @@ struct config {
   /** @brief Canonical URL of web interface */
   const char *url;
 
+  /** @brief Short display limit */
+  long short_display;
+
   /** @brief Maximum refresh interval for web interface (seconds) */
   long refresh;
 
@@ -237,7 +251,7 @@ struct config {
 extern struct config *config;
 /* the current configuration */
 
-int config_read(void);
+int config_read(int server);
 /* re-read config, return 0 on success or non-0 on error.
  * Only updates @config@ if the new configuration is valid. */