From fb33e286b5c23dbe8d0aeaf63cd3490bed3906e3 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sat, 26 Apr 2008 10:44:59 +0300 Subject: Move global mconfig to mpctx The global was used in the function cfg_include which handles the -include option. Make the address available in that function by creating a new dynamically allocated option in m_config_new that has the address in the option's private data. asxparser.c also used the global. Making it available through all ways the code could get called required a number of relatively straightforward changes to playtree and menu code. --- cfg-common-opts.h | 1 - 1 file changed, 1 deletion(-) (limited to 'cfg-common-opts.h') diff --git a/cfg-common-opts.h b/cfg-common-opts.h index 36e43f65c8..b2e47faf18 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -9,7 +9,6 @@ #ifdef USE_ICONV {"msgcharset", &mp_msg_charset, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, #endif - {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, #ifdef WIN32 {"priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL}, #endif -- cgit v1.2.3