X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/637fdea366a8a87024322d283eba89067a403493..807d26441e9423b2532e807eafba82c1e6dac282:/lib/configuration.h diff --git a/lib/configuration.h b/lib/configuration.h index e9893f0..51dc835 100644 --- a/lib/configuration.h +++ b/lib/configuration.h @@ -1,6 +1,7 @@ + /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,9 +25,10 @@ #ifndef CONFIGURATION_H #define CONFIGURATION_H -#include "speaker-protocol.h" +#include -struct real_pcre; +#include "speaker-protocol.h" +#include "rights.h" /* Configuration is kept in a @struct config@; the live configuration * is always pointed to by @config@. Values in @config@ are UTF-8 encoded. @@ -68,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 */ @@ -83,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 */ }; @@ -102,6 +104,9 @@ struct config { /** @brief All players */ struct stringlistlist player; + /** @brief All tracklength plugins */ + struct stringlistlist tracklength; + /** @brief Allowed users */ struct stringlistlist allow; @@ -114,6 +119,9 @@ struct config { /** @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; @@ -170,15 +178,29 @@ struct config { /** @brief Sox syntax generation */ long sox_generation; - /** @brief Speaker backend + /** @brief API used to play sound * * Choices are @ref BACKEND_ALSA, @ref BACKEND_COMMAND or @ref * BACKEND_NETWORK. */ - int speaker_backend; + int api; + +/* 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_COREAUDIO 3 /**< Use Core Audio (Mac only) */ +#define BACKEND_OSS 4 /**< Use OSS */ + +#if HAVE_ALSA_ASOUNDLIB_H +# define DEFAULT_BACKEND BACKEND_ALSA +#elif HAVE_SYS_SOUNDCARD_H || EMPEG_HOST +# define DEFAULT_BACKEND BACKEND_OSS +#elif HAVE_COREAUDIO_AUDIOHARDWARE_H +# define DEFAULT_BACKEND BACKEND_COREAUDIO +#else +# error Cannot choose a default backend +#endif /** @brief Home directory for state files */ const char *home; @@ -196,7 +218,10 @@ struct config { struct stringlist templates; /** @brief Canonical URL of web interface */ - const char *url; + char *url; + + /** @brief Short display limit */ + long short_display; /** @brief Maximum refresh interval for web interface (seconds) */ long refresh; @@ -214,6 +239,9 @@ struct config { /** @brief Target queue length */ long queue_pad; + /** @brief Minimum time between a track being played again */ + long replay_min; + struct namepartlist namepart; /* transformations */ /** @brief Termination signal for subprocesses */ @@ -232,15 +260,51 @@ struct config { /** @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; + + /** @brief Default rights for a new user */ + char *default_rights; + + /** @brief SMTP server for sending mail */ + char *smtp_server; + + /** @brief Origin address for outbound mail */ + char *mail_sender; + + /** @brief Maximum number of tracks in response to 'new' */ + long new_max; + + /** @brief Minimum interval between password reminder emails */ + long reminder_interval; + + /** @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 */ char **parts; /* name part list */ + + /* undocumented, for testing only */ + long dbversion; }; 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. */ @@ -260,6 +324,7 @@ char *config_private(void); /* get the private config file */ extern char *configfile; +extern int config_per_user; #endif /* CONFIGURATION_H */