diff options
author | wm4 <wm4@nowhere> | 2014-08-29 11:58:49 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-08-29 11:58:49 +0200 |
commit | ac2502141d82bbf4dd25d3bdd33c9d57d79d2d7a (patch) | |
tree | 19a8fadb53f73d481d70639a42b3f230a33dac11 /stream/cache.c | |
parent | 66f158b89b92c9af9aa8a54fee12a21d74770b6b (diff) | |
download | mpv-ac2502141d82bbf4dd25d3bdd33c9d57d79d2d7a.tar.bz2 mpv-ac2502141d82bbf4dd25d3bdd33c9d57d79d2d7a.tar.xz |
stream: tweaks to network reconnection code
Don't reconnect to the cache (since the cached stream already handles
reconnection). This is necessary, because since commit 0b428e44 the
"streaming" field (which also controls whether attempting to reconnect
makes sense at all) is inherited to the cache stream wrapper.
Also, let the stream reset its own position on reconnect. This removes
some assumptions and messy handling from the reconnect function.
Make sure the cache is dropped on reconnect. This takes care of
readjusting the stream position if necessary. (Also drop the cache on
DVB channel switching commands.)
Diffstat (limited to 'stream/cache.c')
-rw-r--r-- | stream/cache.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/stream/cache.c b/stream/cache.c index 6bd729c6fa..90683aa6db 100644 --- a/stream/cache.c +++ b/stream/cache.c @@ -415,6 +415,9 @@ static bool control_needs_flush(int stream_ctrl) case STREAM_CTRL_AVSEEK: case STREAM_CTRL_SET_ANGLE: case STREAM_CTRL_SET_CURRENT_TITLE: + case STREAM_CTRL_RECONNECT: + case STREAM_CTRL_DVB_SET_CHANNEL: + case STREAM_CTRL_DVB_STEP_CHANNEL: return true; } return false; |