From 04320d26ebb8a9ea2cfba9a7b6ddec0920326233 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 9 Sep 2016 17:44:02 +0200 Subject: stream, demux, config: remove some dead/unneeded option-related code This has all been made unnecessary recently. The change not to copy the global option struct in particular can be made because now nothing accesses the global options anymore in the demux and stream layers. Some code that was accidentally added/changed in commit 5e30e7a0 is also removed, because it was simply committed accidentally, and was never used. --- stream/stream.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'stream/stream.h') diff --git a/stream/stream.h b/stream/stream.h index 90545da087..4444da8ed3 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -157,11 +157,6 @@ typedef struct stream_info_st { // opts is set from ->opts int (*open)(struct stream *st); const char *const *protocols; - int priv_size; - const void *priv_defaults; - void *(*get_defaults)(struct stream *st); - const struct m_option *options; - const char *const *url_options; bool can_write; // correctly checks for READ/WRITE modes bool is_safe; // opening is no security issue, even with remote provided URLs bool is_network; // used to restrict remote playlist entries to remote URLs @@ -203,7 +198,6 @@ typedef struct stream { bool is_network : 1; // original stream_info_t.is_network flag bool allow_caching : 1; // stream cache makes sense struct mp_log *log; - struct MPOpts *opts; struct mpv_global *global; struct mp_cancel *cancel; // cancellation notification @@ -296,13 +290,6 @@ void mp_setup_av_network_options(struct AVDictionary **dict, struct mpv_global *global, struct mp_log *log); -// sort-of legacy handling of options-in-stream-URL -#define URL_USERNAME 0 -#define URL_HOSTNAME 1 -#define URL_PORT 2 -#define URL_FILENAME 3 -void mp_parse_legacy_url(bstr url, bstr components[4]); - void stream_print_proto_list(struct mp_log *log); char **stream_get_proto_list(void); bool stream_has_proto(const char *proto); -- cgit v1.2.3