X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/04e1fa7cf5163aa784baaf3292ccb3b49e296410..136ef3a3547288ed511cec74d71ca93d6a52b700:/lib/configuration.h diff --git a/lib/configuration.h b/lib/configuration.h index f08b866..78c31ef 100644 --- a/lib/configuration.h +++ b/lib/configuration.h @@ -1,6 +1,6 @@ /* * 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 @@ -177,12 +177,12 @@ 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; #define BACKEND_ALSA 0 /**< Use ALSA (Linux only) */ #define BACKEND_COMMAND 1 /**< Execute a command */ #define BACKEND_NETWORK 2 /**< Transmit RTP */ @@ -205,7 +205,7 @@ struct config { struct stringlist templates; /** @brief Canonical URL of web interface */ - const char *url; + char *url; /** @brief Short display limit */ long short_display; @@ -226,6 +226,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 */ @@ -254,7 +257,22 @@ struct config { long cookie_key_lifetime; /** @brief Default rights for a new user */ - rights_type default_rights; + 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; /* derived values: */ int nparts; /* number of distinct name parts */