options: move most subtitle and OSD rendering options to sub structs

Remove them from the big MPOpts struct and move them to their sub
structs. In the places where their fields are used, create a private
copy of the structs, instead of accessing the semi-deprecated global
option struct instance (mpv_global.opts) directly.

This actually makes accessing these options finally thread-safe. They
weren't even if they should have for years. (Including some potential
for undefined behavior when e.g. the OSD font was changed at runtime.)

This is mostly transparent. All options get moved around, but most users
of the options just need to access a different struct (changing sd.opts
to a different type changes a lot of uses, for example).

One thing which has to be considered and could cause potential
regressions is that the new option copies must be explicitly updated.
sub_update_opts() takes care of this for example.

Another thing is that writing to the option structs manually won't work,
because the changes won't be propagated to other copies. Apparently the
only affected case is the implementation of the sub-step command, which
tries to change sub_delay. Handle this one explicitly (osd_changed()
doesn't need to be called anymore, because changing the option triggers
UPDATE_OSD, and updates the OSD as a consequence). The way the option
value is propagated is rather hacky, but for now this will do.
This commit is contained in:
wm4
2017-12-29 17:19:25 +01:00
committed by Kevin Mitchell
parent 3bf7df4a5e
commit 6aad532aa3
15 changed files with 222 additions and 153 deletions

View File

@@ -12,7 +12,7 @@
struct sd {
struct mpv_global *global;
struct mp_log *log;
struct MPOpts *opts;
struct mp_subtitle_opts *opts;
const struct sd_functions *driver;
void *priv;