~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server side support for cookies, basic tests
[disorder]
/
lib
/
configuration.h
diff --git
a/lib/configuration.h
b/lib/configuration.h
index
84b1eb8
..
eb028b0
100644
(file)
--- a/
lib/configuration.h
+++ b/
lib/configuration.h
@@
-96,9
+96,15
@@
struct transformlist {
struct config {
/* server config */
struct config {
/* server config */
+ /** @brief Authorization algorithm */
+ char *authorization_algorithm;
+
/** @brief All players */
struct stringlistlist player;
/** @brief All players */
struct stringlistlist player;
+ /** @brief All tracklength plugins */
+ struct stringlistlist tracklength;
+
/** @brief Allowed users */
struct stringlistlist allow;
/** @brief Allowed users */
struct stringlistlist allow;
@@
-111,6
+117,9
@@
struct config {
/** @brief Maximum number of recent tracks to record in history */
long history;
/** @brief Maximum number of recent tracks to record in history */
long history;
+ /** @brief Expiry limit for noticed.db */
+ long noticed_history;
+
/** @brief Trusted users */
struct stringlist trust;
/** @brief Trusted users */
struct stringlist trust;
@@
-176,6
+185,8
@@
struct config {
#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 */
+#define BACKEND_COREAUDIO 3 /**< Use Core Audio (Mac only) */
+#define BACKEND_OSS 4 /**< Use OSS */
/** @brief Home directory for state files */
const char *home;
/** @brief Home directory for state files */
const char *home;
@@
-195,6
+206,9
@@
struct config {
/** @brief Canonical URL of web interface */
const char *url;
/** @brief Canonical URL of web interface */
const char *url;
+ /** @brief Short display limit */
+ long short_display;
+
/** @brief Maximum refresh interval for web interface (seconds) */
long refresh;
/** @brief Maximum refresh interval for web interface (seconds) */
long refresh;
@@
-229,15
+243,27
@@
struct config {
/** @brief TTL for multicast packets */
long multicast_ttl;
/** @brief TTL for multicast packets */
long multicast_ttl;
+ /** @brief Whether to loop back multicast packets */
+ int multicast_loop;
+
+ /** @brief Login lifetime in seconds */
+ long cookie_login_lifetime;
+
+ /** @brief Signing key lifetime in seconds */
+ long cookie_key_lifetime;
+
/* derived values: */
int nparts; /* number of distinct name parts */
char **parts; /* name part list */
/* derived values: */
int nparts; /* number of distinct name parts */
char **parts; /* name part list */
+
+ /* undocumented, for testing only */
+ long dbversion;
};
extern struct config *config;
/* the current configuration */
};
extern struct config *config;
/* the current configuration */
-int config_read(
void
);
+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. */
@@
-257,6
+283,7
@@
char *config_private(void);
/* get the private config file */
extern char *configfile;
/* get the private config file */
extern char *configfile;
+extern int config_per_user;
#endif /* CONFIGURATION_H */
#endif /* CONFIGURATION_H */