disobedience notices rescans

[disorder] / lib / configuration.c

diff --git a/lib/configuration.c b/lib/configuration.c
index ad410245b5e752031b803f1f73a5e46836b5d9c5..f75845cbc1468926f335b2df2da3f5e7f51743ec 100644 (file)
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -857,6 +857,7 @@ static const struct conf conf[] = {
   { C(nice_rescan),      &type_integer,          validate_non_negative },
   { C(nice_server),      &type_integer,          validate_any },
   { C(nice_speaker),     &type_integer,          validate_any },
   { C(nice_rescan),      &type_integer,          validate_non_negative },
   { C(nice_server),      &type_integer,          validate_any },
   { C(nice_speaker),     &type_integer,          validate_any },

+  { C(noticed_history),  &type_integer,          validate_positive },

   { C(password),         &type_string,           validate_any },
   { C(player),           &type_stringlist_accum, validate_player },
   { C(plugins),          &type_string_accum,     validate_isdir },
   { C(password),         &type_string,           validate_any },
   { C(player),           &type_stringlist_accum, validate_player },
   { C(plugins),          &type_string_accum,     validate_isdir },


@@ -992,6 +993,7 @@ static struct config *config_default(void) {
   c->speaker_backend = -1;
   c->multicast_ttl = 1;
   c->authorization_algorithm = xstrdup("sha1");
   c->speaker_backend = -1;
   c->multicast_ttl = 1;
   c->authorization_algorithm = xstrdup("sha1");

+  c->noticed_history = 31;

   return c;
 }
 
   return c;
 }
 


@@ -1023,7 +1025,8 @@ static void config_free(struct config *c) {
 }
 
 /** @brief Set post-parse defaults */
 }
 
 /** @brief Set post-parse defaults */

-static void config_postdefaults(struct config *c) {
+static void config_postdefaults(struct config *c,
+                               int server) {

   struct config_state cs;
   const struct conf *whoami;
   int n;
   struct config_state cs;
   const struct conf *whoami;
   int n;


@@ -1072,10 +1075,12 @@ static void config_postdefaults(struct config *c) {
 #endif
     }
   }
 #endif
     }
   }

-  if(c->speaker_backend == BACKEND_COMMAND && !c->speaker_command)
-    fatal(0, "speaker_backend is command but speaker_command is not set");
-  if(c->speaker_backend == BACKEND_NETWORK && !c->broadcast.n)
-    fatal(0, "speaker_backend is network but broadcast is not set");
+  if(server) {
+    if(c->speaker_backend == BACKEND_COMMAND && !c->speaker_command)
+      fatal(0, "speaker_backend is command but speaker_command is not set");
+    if(c->speaker_backend == BACKEND_NETWORK && !c->broadcast.n)
+      fatal(0, "speaker_backend is network but broadcast is not set");
+  }

   if(c->speaker_backend) {
     /* Override sample format */
     c->sample_format.rate = 44100;
   if(c->speaker_backend) {
     /* Override sample format */
     c->sample_format.rate = 44100;


@@ -1085,8 +1090,10 @@ static void config_postdefaults(struct config *c) {
   }
 }
 
   }
 }
 

-/** @brief (Re-)read the config file */
-int config_read() {
+/** @brief (Re-)read the config file
+ * @param server If set, do extra checking
+ */
+int config_read(int server) {

   struct config *c;
   char *privconf;
   struct passwd *pw;
   struct config *c;
   char *privconf;
   struct passwd *pw;


@@ -1118,7 +1125,7 @@ int config_read() {
     return -1;
   xfree(privconf);
   /* install default namepart and transform settings */
     return -1;
   xfree(privconf);
   /* install default namepart and transform settings */

-  config_postdefaults(c);
+  config_postdefaults(c, server);

   /* everything is good so we shall use the new config */
   config_free(config);
   config = c;
   /* everything is good so we shall use the new config */
   config_free(config);
   config = c;