disobedience notices rescans

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index eabbcce5a42c58151231bbaf03f72445498ab4cf..476a917a33391e36f6ebc0a0b0064db0bf7f830f 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,6 +96,9 @@ 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;
 


@@ -111,6 +114,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 +168,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;


@@ -237,7 +243,7 @@ struct config {
 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. */