Merge playlist branch against trunk to date.

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index 624e495780001cf690d56dc39b0b612274b6508c..54fb4f8eebff6abbd7c7b5910a54c41fa2d1056d 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -183,6 +183,12 @@ struct config {
    */
   int api;
 
+  /** @brief Maximum size of a playlist */
+  long playlist_max;
+
+  /** @brief Maximum lifetime of a playlist lock */
+  long playlist_lock_timeout;
+
 /* These values had better be non-negative */
 #define BACKEND_ALSA 0                 /**< Use ALSA (Linux only) */
 #define BACKEND_COMMAND 1              /**< Execute a command */