X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/e7b9569145b3469f9487ac31155410cd2d982a3c..ddbf05c8c1f1e6fd25184bf7f22ee5b67eaaa582:/lib/configuration.c

diff --git a/lib/configuration.c b/lib/configuration.c
index 540084c..934e52b 100644
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -952,6 +952,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 },
@@ -1198,6 +1200,8 @@ static struct config *config_default(void) {
   c->reminder_interval = 600;		/* 10m */
   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);