diff options
| author | Max Kellermann <max@duempel.org> | 2008-12-21 19:40:06 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-12-21 19:40:06 +0100 |
| commit | 3b2a752d0edae8868fb7a01554be0069022843a9 (patch) | |
| tree | cbc744bc60f919b4d15a446efb3a34db6b9eec65 | |
| parent | bc31d7a0ee0a999cdb2d21fb8f0c64ac0a263263 (diff) | |
| parent | e75e40085fb3492ceda7c92afb77cef6b98e71a1 (diff) | |
| download | mpd-3b2a752d0edae8868fb7a01554be0069022843a9.tar.gz mpd-3b2a752d0edae8868fb7a01554be0069022843a9.tar.xz mpd-3b2a752d0edae8868fb7a01554be0069022843a9.zip | |
Merge branch 'http_buffer_remove' of git://git.musicpd.org/avuton/mpd
| -rw-r--r-- | doc/mpd.conf.5 | 8 | ||||
| -rw-r--r-- | src/conf.c | 2 | ||||
| -rw-r--r-- | src/conf.h | 2 |
3 files changed, 0 insertions, 12 deletions
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5 index ff24fd82a..b0f69eb58 100644 --- a/doc/mpd.conf.5 +++ b/doc/mpd.conf.5 @@ -195,14 +195,6 @@ song. Try increasing this if you hear skipping when manually changing songs. The default is 10%, a little over 1 second of CD-quality audio with the default buffer size. .TP -.B http_buffer_size <size in KiB> -This specifies the size of the buffer used for playing HTTP streams. The -default is 128. -.TP -.B http_prebuffer_size <size in KiB> -This specifies how much of an HTTP stream should be buffered before beginning -playback. The default is 32. -.TP .B http_proxy_host <hostname> Use to specify the proxy host used for HTTP connections. .TP diff --git a/src/conf.c b/src/conf.c index cdcb917f6..680a5fb1c 100644 --- a/src/conf.c +++ b/src/conf.c @@ -171,8 +171,6 @@ void initConf(void) registerConfigParam(CONF_SAMPLERATE_CONVERTER, 0, 0); registerConfigParam(CONF_AUDIO_BUFFER_SIZE, 0, 0); registerConfigParam(CONF_BUFFER_BEFORE_PLAY, 0, 0); - registerConfigParam(CONF_HTTP_BUFFER_SIZE, 0, 0); - registerConfigParam(CONF_HTTP_PREBUFFER_SIZE, 0, 0); registerConfigParam(CONF_HTTP_PROXY_HOST, 0, 0); registerConfigParam(CONF_HTTP_PROXY_PORT, 0, 0); registerConfigParam(CONF_HTTP_PROXY_USER, 0, 0); diff --git a/src/conf.h b/src/conf.h index e2e50c5bc..2b73bb6d7 100644 --- a/src/conf.h +++ b/src/conf.h @@ -49,8 +49,6 @@ #define CONF_SAMPLERATE_CONVERTER "samplerate_converter" #define CONF_AUDIO_BUFFER_SIZE "audio_buffer_size" #define CONF_BUFFER_BEFORE_PLAY "buffer_before_play" -#define CONF_HTTP_BUFFER_SIZE "http_buffer_size" -#define CONF_HTTP_PREBUFFER_SIZE "http_prebuffer_size" #define CONF_HTTP_PROXY_HOST "http_proxy_host" #define CONF_HTTP_PROXY_PORT "http_proxy_port" #define CONF_HTTP_PROXY_USER "http_proxy_user" |