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.

1 files changed, 2 insertions, 1 deletions

diff --git a/m_config.h b/m_config.h
index 156f7b8fbb..60064e8771 100644
--- a/m_config.h
+++ b/m_config.h
@@ -96,7 +96,8 @@ typedef struct m_config {
 /** \ingroup Config
  */
 m_config_t*
-m_config_new(void *optstruct);
+m_config_new(void *optstruct,
+             int includefunc(struct m_option *conf, char *filename));
 
 /// Free a config object.
 void