more testing

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index 297555709f41aaba3bc4fc00799679d7c250f147..6618e1ad3a5c6babfadbe40664bda170913c8590 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -24,7 +24,7 @@
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 

-#include <ao/ao.h>
+#include "speaker-protocol.h"

 
 struct real_pcre;
 
 
 struct real_pcre;
 


@@ -96,9 +96,15 @@ struct transformlist {
 struct config {
   /* server config */
 
 struct config {
   /* server config */
 

+  /** @brief Authorization algorithm */
+  char *authorization_algorithm;
+  

   /** @brief All players */
   struct stringlistlist player;
 
   /** @brief All players */
   struct stringlistlist player;
 

+  /** @brief All tracklength plugins */
+  struct stringlistlist tracklength;
+

   /** @brief Allowed users */
   struct stringlistlist allow;
 
   /** @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 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;
 
   /** @brief Trusted users */
   struct stringlist trust;
 


@@ -162,7 +171,7 @@ struct config {
   const char *speaker_command;
 
   /** @brief Target sample format */
   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;
 
   /** @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_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;
 
   /** @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 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;
 
   /** @brief Maximum refresh interval for web interface (seconds) */
   long refresh;
 


@@ -220,18 +234,30 @@ struct config {
   const char *device;
   struct transformlist transform;      /* path name transformations */
 
   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;
+
+  /** @brief Whether to loop back multicast packets */
+  int multicast_loop;
+  

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

+
+  /* undocumented, for testing only */
+  long dbversion;

 };
 
 extern struct config *config;
 /* the current configuration */
 
 };
 
 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. */
 
 /* re-read config, return 0 on success or non-0 on error.
  * Only updates @config@ if the new configuration is valid. */