Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

m_config: add custom context to includefunc callback

Browse Source
This commit is contained in:
wm4
2013-12-21 19:27:19 +01:00
parent 3846fc7587
commit dadf3a9a46
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
player/main.c
View File

@@ -292,9 +292,10 @@ static void init_input(struct MPContext *mpctx)
#endif
}
static int cfg_include(struct m_config *conf, char *filename, int flags)
static int cfg_include(void *ctx, char *filename, int flags)
{
return m_config_parse_config_file(conf, filename, flags);
struct MPContext *mpctx = ctx;
return m_config_parse_config_file(mpctx->mconfig, filename, flags);
}
static int mpv_main(int argc, char *argv[])
@@ -318,6 +319,7 @@ static int mpv_main(int argc, char *argv[])
&mp_default_opts, mp_opts);
mpctx->opts = mpctx->mconfig->optstruct;
mpctx->mconfig->includefunc = cfg_include;
mpctx->mconfig->includefunc_ctx = mpctx;
mpctx->mconfig->use_profiles = true;
mpctx->mconfig->is_toplevel = true;