Max,
Please pull the http_buffer* removal stuff from:
git://git.musicpd.org/avuton/mpd.git http_buffer_remove
--
Avuton Olrich (1):
Remove obsolete http_buffer* stuff that went away with the new
curl backend.
--
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 31b105c..8cc3b05 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -192,14 +192,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 cdcb917..680a5fb 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 e2e50c5..2b73bb6 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"
--
avuton
--
| (\_/) This is Bunny. Copy and paste Bunny
| (='.'=) into your signature to help him gain
| (")_(") world domination.
------------------------------------------------------------------------------
_______________________________________________
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
