diff options
| author | wm4 <wm4@nowhere> | 2016-09-06 11:11:36 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-09-06 11:11:36 +0200 |
| commit | 9ab0f60d444984581e188b9987faed9b80eda7e2 (patch) | |
| tree | 8317a840dfa7d50ac0d604ecefa115060d3202a2 /video/out/opengl/lcms.h | |
| parent | e5cefa346da00feb01a2bb76be19a9d80e191a12 (diff) | |
| download | mpv-9ab0f60d444984581e188b9987faed9b80eda7e2.tar.bz2 mpv-9ab0f60d444984581e188b9987faed9b80eda7e2.tar.xz | |
vo_opengl: simplify option handling
Instead of copying the options around... just don't. video.c now has
full control over when options are updated. (It still gets notified from
outside, but it decides when the updated options are copied: when
m_config_cache_update() is called.) So there's no need for tricky
stuff, and it can be simplified a bit.
Also change lcms.c. We could do it like video.c, and get the options
from the global config store. But it seems simpler to just provide a
pointer to an option struct, which is arbitrarily mutated from the
outside (from the perspective of lcms.c).
Diffstat (limited to 'video/out/opengl/lcms.h')
| -rw-r--r-- | video/out/opengl/lcms.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/video/out/opengl/lcms.h b/video/out/opengl/lcms.h index 094514ac9e..0c0a959e82 100644 --- a/video/out/opengl/lcms.h +++ b/video/out/opengl/lcms.h @@ -26,8 +26,9 @@ struct mpv_global; struct gl_lcms; struct gl_lcms *gl_lcms_init(void *talloc_ctx, struct mp_log *log, - struct mpv_global *global); -void gl_lcms_set_options(struct gl_lcms *p, struct mp_icc_opts *opts); + struct mpv_global *global, + struct mp_icc_opts *opts); +void gl_lcms_update_options(struct gl_lcms *p); bool gl_lcms_set_memory_profile(struct gl_lcms *p, bstr profile); bool gl_lcms_has_profile(struct gl_lcms *p); bool gl_lcms_get_lut3d(struct gl_lcms *p, struct lut3d **, |