summaryrefslogtreecommitdiffstats
path: root/player/core.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-28 15:30:27 +0100
committerwm4 <wm4@nowhere>2014-10-28 20:30:12 +0100
commit77b06fa017c70491c9b3820fdf14aeeb27b6088c (patch)
treea1aa4499f5914e810aabe31a7d2b89c13436fada /player/core.h
parent0da9ee79e768dfb12e2eeabf5115642f1fb9da32 (diff)
downloadmpv-77b06fa017c70491c9b3820fdf14aeeb27b6088c.tar.bz2
mpv-77b06fa017c70491c9b3820fdf14aeeb27b6088c.tar.xz
player: handle edition reloading slightly differently
Use the codepath that is normally used for DVD/BD title switching and DVB channel switching. Removes some extra artifacts from the client API: now MPV_EVENT_END_FILE will never be called on reloads (and neither is MPV_EVENT_START_FILE).
Diffstat (limited to 'player/core.h')
-rw-r--r--player/core.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/player/core.h b/player/core.h
index c0a00e454b..9b9873e610 100644
--- a/player/core.h
+++ b/player/core.h
@@ -36,7 +36,6 @@ enum stop_play_reason {
PT_NEXT_ENTRY, // prepare to play next entry in playlist
PT_CURRENT_ENTRY, // prepare to play mpctx->playlist->current
PT_STOP, // stop playback, clear playlist
- PT_RESTART, // restart previous file
PT_RELOAD_DEMUXER, // restart playback, but keep stream open
PT_QUIT, // stop playback, quit player
};
@@ -192,6 +191,7 @@ typedef struct MPContext {
int64_t shown_vframes, shown_aframes;
+ struct stream *stream; // stream that was initially opened
struct demuxer **sources;
int num_sources;
@@ -202,7 +202,6 @@ typedef struct MPContext {
int num_chapters;
double video_offset;
- struct stream *stream;
struct demuxer *demuxer;
struct track **tracks;