demux: do not access global options

Don't access MPOpts directly, and always use the new m_config.h
functions for accessing them in a thread-safe way.

The goal is eventually removing the mpv_global.opts field, and the
demuxer/stream-layer specific hack that copies MPOpts to deal with
thread-safety issues.

This moves around a lot of options. For one, we often change the
physical storage location of options to make them more localized,
but these changes are not user-visible (or should not be). For
shared options on the other hand it's better to do messy direct
access, which is worrying as in that somehow renaming an option
or changing its type would break code reading them manually,
without causing a compilation error.

1 files changed, 2 insertions, 3 deletions

diff --git a/stream/stream.h b/stream/stream.h
index 1112e09f50..9ee1df25aa 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -223,7 +223,7 @@ void stream_set_capture_file(stream_t *s, const char *filename);
 
 struct mp_cache_opts;
 bool stream_wants_cache(stream_t *stream, struct mp_cache_opts *opts);
-int stream_enable_cache(stream_t **stream, struct mp_cache_opts *opts);
+int stream_enable_cache_defaults(stream_t **stream);
 
 // Internal
 int stream_cache_init(stream_t *cache, stream_t *stream,
@@ -294,8 +294,7 @@ char *mp_file_get_path(void *talloc_ctx, bstr url);
 struct AVDictionary;
 void mp_setup_av_network_options(struct AVDictionary **dict,
                                  struct mpv_global *global,
-                                 struct mp_log *log,
-                                 struct MPOpts *opts);
+                                 struct mp_log *log);
 
 void stream_print_proto_list(struct mp_log *log);
 char **stream_get_proto_list(void);