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 /asxparser.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 'asxparser.h')
-rw-r--r-- | asxparser.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/asxparser.h b/asxparser.h index 2d9b860707..7b148a7775 100644 --- a/asxparser.h +++ b/asxparser.h @@ -14,10 +14,12 @@ struct ASX_Parser_t { int ret_stack_size; char* last_body; int deep; + struct m_config *mconfig; }; - + +struct m_config; ASX_Parser_t* -asx_parser_new(void); +asx_parser_new(struct m_config *mconfig); void asx_parser_free(ASX_Parser_t* parser); |