Implement most of the playlist commands in the server. playlist-set

[disorder] / lib / configuration.c

diff --git a/lib/configuration.c b/lib/configuration.c
index 2e75ecbaaa440832e5e4aa111fa175d7c9a96308..934e52b698535fd039d86082376a4dbf048836d4 100644 (file)
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -952,6 +952,7 @@ static const struct conf conf[] = {
   { C(noticed_history),  &type_integer,          validate_positive },
   { C(password),         &type_string,           validate_any },
   { C(player),           &type_stringlist_accum, validate_player },
+  { C(playlist_lock_timeout), &type_integer,     validate_positive },
   { C(playlist_max) ,    &type_integer,          validate_positive },
   { C(plugins),          &type_string_accum,     validate_isdir },
   { C(prefsync),         &type_integer,          validate_positive },
@@ -1200,6 +1201,7 @@ static struct config *config_default(void) {
   c->new_bias_age = 7 * 86400;         /* 1 week */
   c->new_bias = 9000000;               /* 100 times the base weight */
   c->playlist_max = INT_MAX;            /* effectively no limit */
+  c->playlist_lock_timeout = 10;        /* 10s */
   /* Default stopwords */
   if(config_set(&cs, (int)NDEFAULT_STOPWORDS, (char **)default_stopwords))
     exit(1);