diff options
| author | wm4 <wm4@nowhere> | 2015-07-02 14:38:03 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-07-02 14:38:03 +0200 |
| commit | a609877f00889a5cb5fe3e4e2877eec49cc90ab0 (patch) | |
| tree | 5f5df4dfa14d685a6dd5471fb406826b5669d5ef /player/command.c | |
| parent | a9bbaa5eb29cae310ca8efd4f8d197de406683f7 (diff) | |
| download | mpv-a609877f00889a5cb5fe3e4e2877eec49cc90ab0.tar.bz2 mpv-a609877f00889a5cb5fe3e4e2877eec49cc90ab0.tar.xz | |
player: simplify reload logic
Instead of only reloading the demuxer, reopen the stream as well.
Diffstat (limited to 'player/command.c')
| -rw-r--r-- | player/command.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/player/command.c b/player/command.c index c4fe75dd25..ac403fb50d 100644 --- a/player/command.c +++ b/player/command.c @@ -678,7 +678,7 @@ static int mp_property_disc_title(void *ctx, struct m_property *prop, title = *(int*)arg; if (demux_stream_control(d, STREAM_CTRL_SET_CURRENT_TITLE, &title) < 0) return M_PROPERTY_NOT_IMPLEMENTED; - mpctx->stop_play = PT_RELOAD_DEMUXER; + mpctx->stop_play = PT_RELOAD_FILE; return M_PROPERTY_OK; } return M_PROPERTY_NOT_IMPLEMENTED; @@ -837,7 +837,7 @@ static int mp_property_edition(void *ctx, struct m_property *prop, edition = *(int *)arg; if (edition != demuxer->edition) { opts->edition_id = edition; - mpctx->stop_play = PT_RELOAD_DEMUXER; + mpctx->stop_play = PT_RELOAD_FILE; } return M_PROPERTY_OK; } @@ -2847,7 +2847,7 @@ static int mp_property_dvb_channel(void *ctx, struct m_property *prop, mpctx->last_dvb_step = 1; r = prop_stream_ctrl(mpctx, STREAM_CTRL_DVB_SET_CHANNEL, arg); if (r == M_PROPERTY_OK) - mpctx->stop_play = PT_RELOAD_DEMUXER; + mpctx->stop_play = PT_RELOAD_FILE; return r; case M_PROPERTY_SWITCH: { struct m_property_switch_arg *sa = arg; @@ -2855,7 +2855,7 @@ static int mp_property_dvb_channel(void *ctx, struct m_property *prop, mpctx->last_dvb_step = dir; r = prop_stream_ctrl(mpctx, STREAM_CTRL_DVB_STEP_CHANNEL, &dir); if (r == M_PROPERTY_OK) - mpctx->stop_play = PT_RELOAD_DEMUXER; + mpctx->stop_play = PT_RELOAD_FILE; return r; } case M_PROPERTY_GET_TYPE: |