X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/2a3fcff17b9844f7799c547c795a8ca811d1f794..812b526d127c6657e571db8b33a58137af6709cd:/lib/configuration.c

diff --git a/lib/configuration.c b/lib/configuration.c
index 2a0b89c..cd83224 100644
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -950,6 +950,8 @@ 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 },
   { C(queue_pad),        &type_integer,          validate_positive },
@@ -1197,6 +1199,8 @@ static struct config *config_default(void) {
   c->new_bias_age = 7 * 86400;		/* 1 week */
   c->new_bias = 4500000;		/* 50 times the base weight */
   c->sox_generation = DEFAULT_SOX_GENERATION;
+  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);