From fb33e286b5c23dbe8d0aeaf63cd3490bed3906e3 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@symbol.nonexistent.invalid>
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.
---
 mp_core.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mp_core.h')

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;
-- 
cgit v1.2.3