summaryrefslogtreecommitdiffstats
path: root/mp_core.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-26 10:44:59 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-26 10:44:59 +0300
commitfb33e286b5c23dbe8d0aeaf63cd3490bed3906e3 (patch)
tree9e1eb90e7ec461afd59c3411c2be253b75a9f448 /mp_core.h
parent6be229cbbfbe29ad61025051b1d903f5619e0b8a (diff)
downloadmpv-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 'mp_core.h')
-rw-r--r--mp_core.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/mp_core.h b/mp_core.h
index 7c8d3b4d5a..96846ae5d2 100644
--- a/mp_core.h
+++ b/mp_core.h
@@ -37,6 +37,7 @@
typedef struct MPContext {
struct MPOpts opts;
+ struct m_config *mconfig;
struct vo_x11_state *x11_state;
int osd_show_percentage;
int osd_function;