Commit d8dbd29c authored by Warren Dukes's avatar Warren Dukes

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
parent 4821d9a1
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#define CONF_COMMENT '#' #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_PATHS 6
#define CONF_NUMBER_OF_REQUIRED 5 #define CONF_NUMBER_OF_REQUIRED 5
#define CONF_NUMBER_OF_ALLOW_CATS 1 #define CONF_NUMBER_OF_ALLOW_CATS 1
...@@ -125,7 +125,11 @@ char ** readConf(char * file) { ...@@ -125,7 +125,11 @@ char ** readConf(char * file) {
"default_permissions", "default_permissions",
"audio_buffer_size", "audio_buffer_size",
"replaygain", "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] = { int conf_absolutePaths[CONF_NUMBER_OF_PATHS] = {
...@@ -270,4 +274,3 @@ char ** readConf(char * file) { ...@@ -270,4 +274,3 @@ char ** readConf(char * file) {
char ** getConf() { char ** getConf() {
return conf_params; return conf_params;
} }
/* vim:set shiftwidth=4 tabstop=8 expandtab: */
...@@ -50,6 +50,10 @@ ...@@ -50,6 +50,10 @@
#define CONF_BUFFER_SIZE 26 #define CONF_BUFFER_SIZE 26
#define CONF_REPLAYGAIN 27 #define CONF_REPLAYGAIN 27
#define CONF_AUDIO_OUTPUT_FORMAT 28 #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" #define CONF_CAT_CHAR "\n"
...@@ -63,4 +67,3 @@ void initConf(); ...@@ -63,4 +67,3 @@ void initConf();
void writeConf(char * file); void writeConf(char * file);
#endif #endif
/* vim:set shiftwidth=4 tabstop=8 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment