Low level playlist database operations: read, createwrite, list, delete.

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index bf3a493b394922d0f96fa9299d344a0ee6dbceef..d269beb84cdb1c4626d610e80c3f7c13778ae196 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -25,11 +25,11 @@
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
+#include <pcre.h>
+
 #include "speaker-protocol.h"
 #include "rights.h"
 
-struct real_pcre;
-
 /* Configuration is kept in a @struct config@; the live configuration
  * is always pointed to by @config@.  Values in @config@ are UTF-8 encoded.
  */
@@ -70,7 +70,7 @@ struct collectionlist {
 
 struct namepart {
   char *part;                          /* part */
-  struct real_pcre *re;                        /* regexp */
+  pcre *re;                            /* regexp */
   char *replace;                       /* replacement string */
   char *context;                       /* context glob */
   unsigned reflags;                    /* regexp flags */
@@ -85,7 +85,7 @@ struct transform {
   char *type;                          /* track or dir */
   char *context;                       /* sort or choose */
   char *replace;                       /* substitution string */
-  struct real_pcre *re;                        /* compiled re */
+  pcre *re;                            /* compiled re */
   unsigned flags;                      /* regexp flags */
 };
 
@@ -185,6 +185,9 @@ struct config {
    */
   int api;
 
+  /** @brief Maximum size of a playlist */
+  long playlist_max;
+
 /* These values had better be non-negative */
 #define BACKEND_ALSA 0                 /**< Use ALSA (Linux only) */
 #define BACKEND_COMMAND 1              /**< Execute a command */
@@ -272,6 +275,9 @@ struct config {
   /** @brief Default rights for a new user */
   char *default_rights;
 
+  /** @brief Path to sendmail executable */
+  char *sendmail;
+
   /** @brief SMTP server for sending mail */
   char *smtp_server;
 
@@ -308,6 +314,7 @@ int config_read(int server);
 /* re-read config, return 0 on success or non-0 on error.
  * Only updates @config@ if the new configuration is valid. */
 
+char *config_get_file2(struct config *c, const char *name);
 char *config_get_file(const char *name);
 /* get a filename within the home directory */