relax config file checking for non-server programs

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index c7b5b09..a2033c2 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -17,11 +17,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
+/** @file lib/configuration.h
+ * @brief Configuration file support
+ */
 
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
-#include <ao/ao.h>
+#include "speaker-protocol.h"
 
 struct real_pcre;
 
@@ -93,6 +96,9 @@ struct transformlist {
 struct config {
   /* server config */
 
+  /** @brief Authorization algorithm */
+  char *authorization_algorithm;
+  
   /** @brief All players */
   struct stringlistlist player;
 
@@ -159,7 +165,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;
@@ -217,8 +223,14 @@ struct config {
   const char *device;
   struct transformlist transform;      /* path name transformations */
 
-  struct stringlist broadcast;         /* audio broadcast address */
-  struct stringlist broadcast_from;    /* audio broadcast source address */
+  /** @brief Address to send audio data to */
+  struct stringlist broadcast;
+
+  /** @brief Source address for network audio transmission */
+  struct stringlist broadcast_from;
+
+  /** @brief TTL for multicast packets */
+  long multicast_ttl;
 
   /* derived values: */
   int nparts;                          /* number of distinct name parts */
@@ -228,7 +240,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. */