diff options
author | wm4 <wm4@nowhere> | 2016-01-17 16:56:32 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-01-17 16:57:22 +0100 |
commit | 004bc9526308c6bc3f51591423e88bb1adaff167 (patch) | |
tree | 07fb82b2ba2920096a5a7de222b0e4a334c4985a /player/core.h | |
parent | 24fc176dfb0219bea6b9327b5299b6bb7d755732 (diff) | |
download | mpv-004bc9526308c6bc3f51591423e88bb1adaff167.tar.bz2 mpv-004bc9526308c6bc3f51591423e88bb1adaff167.tar.xz |
player: refactor: eliminate MPContext.d_sub
The same is going to happen to d_video and d_audio later.
Diffstat (limited to 'player/core.h')
-rw-r--r-- | player/core.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/player/core.h b/player/core.h index 456d463d5a..715ce74ef3 100644 --- a/player/core.h +++ b/player/core.h @@ -142,7 +142,7 @@ struct track { struct sh_stream *stream; // Current subtitle state (or cached state if selected==false). - struct dec_sub *dec_sub; + struct dec_sub *d_sub; // For external subtitles, which are read fully on init. Do not attempt // to read packets from them. @@ -261,7 +261,6 @@ typedef struct MPContext { struct dec_video *d_video; struct dec_audio *d_audio; - struct dec_sub *d_sub[2]; // Uses: accessing metadata (consider ordered chapters case, where the main // demuxer defines metadata), or special purpose demuxers like TV. @@ -517,8 +516,9 @@ void mp_load_scripts(struct MPContext *mpctx); // sub.c void reset_subtitle_state(struct MPContext *mpctx); -void reinit_subs(struct MPContext *mpctx, int order); -void uninit_sub(struct MPContext *mpctx, int order); +void reinit_sub(struct MPContext *mpctx, struct track *track); +void reinit_sub_all(struct MPContext *mpctx); +void uninit_sub(struct MPContext *mpctx, struct track *track); void uninit_sub_all(struct MPContext *mpctx); void update_osd_msg(struct MPContext *mpctx); bool update_subtitles(struct MPContext *mpctx, double video_pts); |