diff options
author | wm4 <wm4@nowhere> | 2014-01-18 01:19:20 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-01-18 01:27:43 +0100 |
commit | 7f4a09bb8534dfafd83099d773adf2e33c64e267 (patch) | |
tree | 5b75791151f92e164fbd9badee47590d1164683d /video/out/gl_osd.c | |
parent | 92a9f11a0b4fda60c8880014be5920dcf3e95253 (diff) | |
download | mpv-7f4a09bb8534dfafd83099d773adf2e33c64e267.tar.bz2 mpv-7f4a09bb8534dfafd83099d773adf2e33c64e267.tar.xz |
sub: uglify OSD code path with locking
Do two things:
1. add locking to struct osd_state
2. make struct osd_state opaque
While 1. is somewhat simple, 2. is quite horrible. Lots of code accesses
lots of osd_state (and osd_object) members. To make sure everything is
accessed synchronously, I prefer making osd_state opaque, even if it
means adding pretty dumb accessors.
All of this is meant to allow running VO in their own threads.
Eventually, VOs will request OSD on their own, which means osd_state
will be accessed from foreign threads.
Diffstat (limited to 'video/out/gl_osd.c')
-rw-r--r-- | video/out/gl_osd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/gl_osd.c b/video/out/gl_osd.c index 99b64176ae..393619e554 100644 --- a/video/out/gl_osd.c +++ b/video/out/gl_osd.c @@ -282,7 +282,7 @@ void mpgl_osd_draw_cb(struct mpgl_osd *ctx, { struct draw_cb_closure c = {ctx, cb, cb_ctx}; reset(ctx); - osd_draw(osd, res, osd->vo_pts, 0, ctx->formats, draw_cb, &c); + osd_draw(osd, res, osd_get_vo_pts(osd), 0, ctx->formats, draw_cb, &c); } void mpgl_osd_redraw_cb(struct mpgl_osd *ctx, @@ -376,5 +376,5 @@ static void draw_legacy_cb(void *pctx, struct sub_bitmaps *imgs) void mpgl_osd_draw_legacy(struct mpgl_osd *ctx, struct osd_state *osd, struct mp_osd_res res) { - osd_draw(osd, res, osd->vo_pts, 0, ctx->formats, draw_legacy_cb, ctx); + osd_draw(osd, res, osd_get_vo_pts(osd), 0, ctx->formats, draw_legacy_cb, ctx); } |