diff options
| author | wm4 <wm4@nowhere> | 2014-06-15 20:46:57 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-06-15 20:53:15 +0200 |
| commit | 716285782d5e4b264e18e253e9d58980183c76c6 (patch) | |
| tree | b03e6e0ead71828f9d68bdebe777a808bee5d26f /video/out/gl_video.h | |
| parent | d88aca6fb2474617136b09c2f281860d6a0a1a38 (diff) | |
| download | mpv-716285782d5e4b264e18e253e9d58980183c76c6.tar.bz2 mpv-716285782d5e4b264e18e253e9d58980183c76c6.tar.xz | |
video/out: change aspects of OSD handling
Let the VOs draw the OSD on their own, instead of making OSD drawing a
separate VO driver call. Further, let it be the VOs responsibility to
request subtitles with the correct PTS. We also basically allow the VO
to request OSD/subtitles at any time.
OSX changes untested.
Diffstat (limited to 'video/out/gl_video.h')
| -rw-r--r-- | video/out/gl_video.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/gl_video.h b/video/out/gl_video.h index 2b0178db55..f6d5b2573d 100644 --- a/video/out/gl_video.h +++ b/video/out/gl_video.h @@ -55,14 +55,14 @@ extern const struct gl_video_opts gl_video_opts_hq_def; struct gl_video; -struct gl_video *gl_video_init(GL *gl, struct mp_log *log); +struct gl_video *gl_video_init(GL *gl, struct mp_log *log, struct osd_state *osd); void gl_video_uninit(struct gl_video *p); void gl_video_set_options(struct gl_video *p, struct gl_video_opts *opts); bool gl_video_check_format(struct gl_video *p, int mp_format); void gl_video_config(struct gl_video *p, struct mp_image_params *params); void gl_video_set_output_depth(struct gl_video *p, int r, int g, int b); void gl_video_set_lut3d(struct gl_video *p, struct lut3d *lut3d); -void gl_video_draw_osd(struct gl_video *p, struct osd_state *osd); +void gl_video_draw_osd(struct gl_video *p); void gl_video_upload_image(struct gl_video *p, struct mp_image *img); void gl_video_render_frame(struct gl_video *p); struct mp_image *gl_video_download_image(struct gl_video *p); |