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. --- player/misc.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'player/misc.c') diff --git a/player/misc.c b/player/misc.c index 62223ebfef..17232ff828 100644 --- a/player/misc.c +++ b/player/misc.c @@ -251,23 +251,6 @@ void merge_playlist_files(struct playlist *pl) talloc_free(edl); } -// Create a talloc'ed copy of mpctx->global. It contains a copy of the global -// option struct. It still just references some things though, like mp_log. -// The main purpose is letting threads access the option struct without the -// need for additional synchronization. -struct mpv_global *create_sub_global(struct MPContext *mpctx) -{ - struct mpv_global *new = talloc_ptrtype(NULL, new); - struct m_config *new_config = m_config_dup(new, mpctx->mconfig); - *new = (struct mpv_global){ - .log = mpctx->global->log, - .config = mpctx->global->config, - .opts = new_config->optstruct, - .client_api = mpctx->clients, - }; - return new; -} - struct wrapper_args { struct MPContext *mpctx; void (*thread_fn)(void *); -- cgit v1.2.3