X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/9d5da57642eeaf8e2b68f18bb1e6f56bfc7510b9..74a94bd06358ca24b4a3a1acaa524c7235f38664:/lib/configuration.h diff --git a/lib/configuration.h b/lib/configuration.h index 75e066c..5f0b8cc 100644 --- a/lib/configuration.h +++ b/lib/configuration.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006 Richard Kettlewell + * Copyright (C) 2004, 2005, 2006, 2007 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 @@ -101,6 +101,11 @@ struct config { long nice_speaker; /* nice value for speaker */ const char *speaker_command; /* command for speaker to run */ ao_sample_format sample_format; /* sample format to enforce */ + long sox_generation; /* sox syntax generation */ + int speaker_backend; /* speaker backend */ +#define BACKEND_ALSA 0 +#define BACKEND_COMMAND 1 +#define BACKEND_NETWORK 2 /* shared client/server config */ const char *home; /* home directory for state files */ /* client config */ @@ -111,6 +116,8 @@ struct config { const char *url; /* canonical URL */ long refresh; /* maximum refresh period */ unsigned restrictions; /* restrictions */ + long queue_pad; /* how far to pad queue with + * random tracks */ #define RESTRICT_SCRATCH 1 #define RESTRICT_REMOVE 2 #define RESTRICT_MOVE 4 @@ -119,6 +126,9 @@ struct config { const char *device; /* ALSA output device */ struct transformlist transform; /* path name transformations */ + struct stringlist broadcast; /* audio broadcast address */ + struct stringlist broadcast_from; /* audio broadcast source address */ + /* derived values: */ int nparts; /* number of distinct name parts */ char **parts; /* name part list */