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 /player/loadfile.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 'player/loadfile.c')
| -rw-r--r-- | player/loadfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index 6262042709..b81da983f8 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -67,7 +67,8 @@ static void uninit_sub(struct MPContext *mpctx, int order) if (mpctx->d_sub[order]) sub_reset(mpctx->d_sub[order]); mpctx->d_sub[order] = NULL; // Note: not free'd. - mpctx->osd->objs[order ? OSDTYPE_SUB2 : OSDTYPE_SUB]->dec_sub = NULL; + int obj = order ? OSDTYPE_SUB2 : OSDTYPE_SUB; + osd_set_sub(mpctx->osd, obj, NULL); reset_subtitles(mpctx, order); reselect_demux_streams(mpctx); } |