X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/812b526d127c6657e571db8b33a58137af6709cd..64370837e6201342a0f41f84aaf0ce106a8635d0:/lib/configuration.h diff --git a/lib/configuration.h b/lib/configuration.h index 54fb4f8..08304be 100644 --- a/lib/configuration.h +++ b/lib/configuration.h @@ -1,7 +1,6 @@ - /* * This file is part of DisOrder. - * Copyright (C) 2004-2008 Richard Kettlewell + * Copyright (C) 2004-2010 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 @@ -27,6 +26,9 @@ #include "speaker-protocol.h" #include "rights.h" +#include "addr.h" + +struct uaudio; /* Configuration is kept in a @struct config@; the live configuration * is always pointed to by @config@. Values in @config@ are UTF-8 encoded. @@ -66,19 +68,23 @@ struct collectionlist { struct collection *s; }; +/** @brief A track name part */ struct namepart { char *part; /* part */ - pcre *re; /* regexp */ + pcre *re; /* compiled regexp */ + char *res; /* regexp as a string */ char *replace; /* replacement string */ char *context; /* context glob */ unsigned reflags; /* regexp flags */ }; +/** @brief A list of track name parts */ struct namepartlist { int n; struct namepart *s; }; +/** @brief A track name transform */ struct transform { char *type; /* track or dir */ char *context; /* sort or choose */ @@ -87,6 +93,7 @@ struct transform { unsigned flags; /* regexp flags */ }; +/** @brief A list of track name transforms */ struct transformlist { int n; struct transform *t; @@ -105,24 +112,15 @@ struct config { /** @brief All tracklength plugins */ struct stringlistlist tracklength; - /** @brief Allowed users */ - struct stringlistlist allow; - /** @brief Scratch tracks */ struct stringlist scratch; - /** @brief Gap between tracks in seconds */ - long gap; - /** @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 User for server to run as */ const char *user; @@ -150,17 +148,12 @@ struct config { /** @brief Mixer channel to use */ char *channel; - long prefsync; /* preflog sync interval */ - /** @brief Secondary listen address */ - struct stringlist listen; + struct netaddress listen; /** @brief Alias format string */ const char *alias; - /** @brief Enable server locking */ - int lock; - /** @brief Nice value for server */ long nice_server; @@ -170,18 +163,17 @@ struct config { /** @brief Command execute by speaker to play audio */ const char *speaker_command; + /** @brief Pause mode for command backend */ + const char *pause_mode; + /** @brief Target sample format */ struct stream_header sample_format; /** @brief Sox syntax generation */ long sox_generation; - /** @brief API used to play sound - * - * Choices are @ref BACKEND_ALSA, @ref BACKEND_COMMAND or @ref - * BACKEND_NETWORK. - */ - int api; + /** @brief API used to play sound */ + const char *api; /** @brief Maximum size of a playlist */ long playlist_max; @@ -189,34 +181,17 @@ struct config { /** @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_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; /** @brief Login username */ - const char *username; + char *username; /** @brief Login password */ - const char *password; + char *password; /** @brief Address to connect to */ - struct stringlist connect; + struct netaddress connect; /** @brief Directories to search for web templates */ struct stringlist templates; @@ -230,15 +205,8 @@ struct config { /** @brief Maximum refresh interval for web interface (seconds) */ long refresh; - /** @brief Facilities restricted to trusted users - * - * A bitmap of @ref RESTRICT_SCRATCH, @ref RESTRICT_REMOVE and @ref - * RESTRICT_MOVE. - */ - unsigned restrictions; /* restrictions */ -#define RESTRICT_SCRATCH 1 /**< Restrict scratching */ -#define RESTRICT_REMOVE 2 /**< Restrict removal */ -#define RESTRICT_MOVE 4 /**< Restrict rearrangement */ + /** @brief Minimum refresh interval for web interface (seconds) */ + long refresh_min; /** @brief Target queue length */ long queue_pad; @@ -256,11 +224,17 @@ struct config { struct transformlist transform; /* path name transformations */ /** @brief Address to send audio data to */ - struct stringlist broadcast; + struct netaddress broadcast; /** @brief Source address for network audio transmission */ - struct stringlist broadcast_from; + struct netaddress broadcast_from; + /** @brief RTP delay threshold */ + long rtp_delay_threshold; + + /** @brief Verbose RTP transmission logging */ + int rtp_verbose; + /** @brief TTL for multicast packets */ long multicast_ttl; @@ -299,7 +273,13 @@ struct config { /** @brief Maximum bias */ long new_bias; - + + /** @brief Rescan on (un)mount */ + int mount_rescan; + + /** @brief RTP mode */ + const char *rtp_mode; + /* derived values: */ int nparts; /* number of distinct name parts */ char **parts; /* name part list */ @@ -311,7 +291,8 @@ struct config { extern struct config *config; /* the current configuration */ -int config_read(int server); +int config_read(int server, + const struct config *oldconfig); /* re-read config, return 0 on success or non-0 on error. * Only updates @config@ if the new configuration is valid. */ @@ -331,9 +312,15 @@ char *config_usersysconf(const struct passwd *pw ); char *config_private(void); /* get the private config file */ +int config_verify(void); + +void config_free(struct config *c); + extern char *configfile; extern int config_per_user; +extern const struct uaudio *const *config_uaudio_apis; + #endif /* CONFIGURATION_H */ /*