diff options
author | wm4 <wm4@nowhere> | 2012-12-01 23:28:58 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-12-03 21:08:51 +0100 |
commit | 6294c785490be5fc31d29758ca592510fd161371 (patch) | |
tree | a03c9135534f28cf7e9a62abcde87c65eb54eeaa /stream/http.c | |
parent | 2d58234c86e59298de52fec12d1eb59086d68763 (diff) | |
download | mpv-6294c785490be5fc31d29758ca592510fd161371.tar.bz2 mpv-6294c785490be5fc31d29758ca592510fd161371.tar.xz |
cache: simplify further
This commit is separate from the previous one to separate our own
changes from changes merged from mplayer2 (as far as that was possible).
Make it easier for stream implementations to request being cached. Set
a default cache size in stream.c, and remove them from various stream
implementations. Only MS streaming support sets a meaningful cache size.
Make querying cache size saner. This reduces the amount of #ifdefs
needed.
Diffstat (limited to 'stream/http.c')
-rw-r--r-- | stream/http.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/stream/http.c b/stream/http.c index c77e7e05c5..8b71435d2f 100644 --- a/stream/http.c +++ b/stream/http.c @@ -214,9 +214,8 @@ static int scast_streaming_start(stream_t *stream) { stream->streaming_ctrl->data = scast_data; stream->streaming_ctrl->streaming_read = scast_streaming_read; stream->streaming_ctrl->streaming_seek = NULL; - stream->streaming_ctrl->prebuffer_size = 64 * 1024; // 64 KBytes - stream->streaming_ctrl->buffering = 1; stream->streaming_ctrl->status = streaming_playing_e; + stream->streaming = true; return 0; } @@ -293,9 +292,8 @@ static int nop_streaming_start( stream_t *stream ) { stream->streaming_ctrl->streaming_read = nop_streaming_read; stream->streaming_ctrl->streaming_seek = nop_streaming_seek; - stream->streaming_ctrl->prebuffer_size = 64*1024; // 64 KBytes - stream->streaming_ctrl->buffering = 1; stream->streaming_ctrl->status = streaming_playing_e; + stream->streaming = true; return 0; } |