~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial playlist tests and consequent fixes.
[disorder]
/
lib
/
configuration.h
diff --git
a/lib/configuration.h
b/lib/configuration.h
index
a06524c
..
b94b684
100644
(file)
--- a/
lib/configuration.h
+++ b/
lib/configuration.h
@@
-1,3
+1,4
@@
+
/*
* This file is part of DisOrder.
* Copyright (C) 2004-2008 Richard Kettlewell
/*
* This file is part of DisOrder.
* Copyright (C) 2004-2008 Richard Kettlewell
@@
-24,11
+25,11
@@
#ifndef CONFIGURATION_H
#define CONFIGURATION_H
#ifndef CONFIGURATION_H
#define CONFIGURATION_H
+#include <pcre.h>
+
#include "speaker-protocol.h"
#include "rights.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.
*/
/* Configuration is kept in a @struct config@; the live configuration
* is always pointed to by @config@. Values in @config@ are UTF-8 encoded.
*/
@@
-69,7
+70,7
@@
struct collectionlist {
struct namepart {
char *part; /* part */
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 */
char *replace; /* replacement string */
char *context; /* context glob */
unsigned reflags; /* regexp flags */
@@
-84,7
+85,7
@@
struct transform {
char *type; /* track or dir */
char *context; /* sort or choose */
char *replace; /* substitution string */
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 */
};
unsigned flags; /* regexp flags */
};
@@
-183,6
+184,14
@@
struct config {
* BACKEND_NETWORK.
*/
int api;
* BACKEND_NETWORK.
*/
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 */
#define BACKEND_NETWORK 2 /**< Transmit RTP */
#define BACKEND_ALSA 0 /**< Use ALSA (Linux only) */
#define BACKEND_COMMAND 1 /**< Execute a command */
#define BACKEND_NETWORK 2 /**< Transmit RTP */
@@
-269,6
+278,9
@@
struct config {
/** @brief Default rights for a new user */
char *default_rights;
/** @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;
/** @brief SMTP server for sending mail */
char *smtp_server;
@@
-283,6
+295,12
@@
struct config {
/** @brief Whether to allow user management over TCP */
int remote_userman;
/** @brief Whether to allow user management over TCP */
int remote_userman;
+
+ /** @brief Maximum age of biased-up tracks */
+ long new_bias_age;
+
+ /** @brief Maximum bias */
+ long new_bias;
/* derived values: */
int nparts; /* number of distinct name parts */
/* derived values: */
int nparts; /* number of distinct name parts */
@@
-299,6
+317,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. */
/* 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 */
char *config_get_file(const char *name);
/* get a filename within the home directory */