diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 10:44:59 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 10:44:59 +0300 |
| commit | fb33e286b5c23dbe8d0aeaf63cd3490bed3906e3 (patch) | |
| tree | 9e1eb90e7ec461afd59c3411c2be253b75a9f448 /cfg-common-opts.h | |
| parent | 6be229cbbfbe29ad61025051b1d903f5619e0b8a (diff) | |
| download | mpv-fb33e286b5c23dbe8d0aeaf63cd3490bed3906e3.tar.bz2 mpv-fb33e286b5c23dbe8d0aeaf63cd3490bed3906e3.tar.xz | |
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.
Diffstat (limited to 'cfg-common-opts.h')
| -rw-r--r-- | cfg-common-opts.h | 1 |
1 files changed, 0 insertions, 1 deletions
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 |