diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-06-20 14:00:34 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-06-20 14:00:34 +0000 |
| commit | d8dbd29c2dfd743bdcc152cad0c634b5a32121fc (patch) | |
| tree | 79bf6eb1ad35f091ac736ef5ff1408b0ba9b903b /src | |
| parent | 4821d9a1e9380ba0272df1e4014261b730824022 (diff) | |
| download | mpd-d8dbd29c2dfd743bdcc152cad0c634b5a32121fc.tar.gz mpd-d8dbd29c2dfd743bdcc152cad0c634b5a32121fc.tar.xz mpd-d8dbd29c2dfd743bdcc152cad0c634b5a32121fc.zip | |
add http proxy config options (no http proxy code yet)
git-svn-id: https://svn.musicpd.org/mpd/trunk@1584 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src')
| -rw-r--r-- | src/conf.c | 9 | ||||
| -rw-r--r-- | src/conf.h | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/conf.c b/src/conf.c index 4c2749bd0..dbeb11fb5 100644 --- a/src/conf.c +++ b/src/conf.c @@ -37,7 +37,7 @@ #define CONF_COMMENT '#' -#define CONF_NUMBER_OF_PARAMS 29 +#define CONF_NUMBER_OF_PARAMS 33 #define CONF_NUMBER_OF_PATHS 6 #define CONF_NUMBER_OF_REQUIRED 5 #define CONF_NUMBER_OF_ALLOW_CATS 1 @@ -125,7 +125,11 @@ char ** readConf(char * file) { "default_permissions", "audio_buffer_size", "replaygain", - "audio_output_format" + "audio_output_format", + "http_proxy_host", + "http_proxy_port", + "http_proxy_user", + "http_proxy_password" }; int conf_absolutePaths[CONF_NUMBER_OF_PATHS] = { @@ -270,4 +274,3 @@ char ** readConf(char * file) { char ** getConf() { return conf_params; } -/* vim:set shiftwidth=4 tabstop=8 expandtab: */ diff --git a/src/conf.h b/src/conf.h index 901cdefb7..1a7c7fef0 100644 --- a/src/conf.h +++ b/src/conf.h @@ -50,6 +50,10 @@ #define CONF_BUFFER_SIZE 26 #define CONF_REPLAYGAIN 27 #define CONF_AUDIO_OUTPUT_FORMAT 28 +#define CONF_HTTP_PROXY_HOST 29 +#define CONF_HTTP_PROXY_PORT 30 +#define CONF_HTTP_PROXY_USER 31 +#define CONF_HTTP_PROXY_PASSWORD 32 #define CONF_CAT_CHAR "\n" @@ -63,4 +67,3 @@ void initConf(); void writeConf(char * file); #endif -/* vim:set shiftwidth=4 tabstop=8 expandtab: */ |