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. --- playtreeparser.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'playtreeparser.h') diff --git a/playtreeparser.h b/playtreeparser.h index 9715f8328c..437d09ad0c 100644 --- a/playtreeparser.h +++ b/playtreeparser.h @@ -16,6 +16,7 @@ struct stream; typedef struct play_tree_parser { struct stream* stream; + struct m_config *mconfig; char *buffer,*iter,*line; int buffer_size , buffer_end; int deep,keep; @@ -28,7 +29,7 @@ typedef struct play_tree_parser { * \return The new parser. */ play_tree_parser_t* -play_tree_parser_new(struct stream* stream,int deep); +play_tree_parser_new(struct stream* stream, struct m_config *mconfig, int deep); /// Destroy a parser. void -- cgit v1.2.3