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

Don't include version.h from make options.c

Browse Source 
I find this annoying. It's the reason common/version.c exists at all.

options.c did this for the user agent, which contains the version
number. Because not including version.h means you can't build the user
agent and use it in mp_default_opts anymore, do something rather awkward
in main.c to initialize the default user agent.
This commit is contained in:
wm4
2013-12-22 14:33:15 +01:00
parent 8b7048b7d5
commit e6bea0ec5a
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
player/main.c
View File

@@ -98,7 +98,8 @@ void mp_print_version(struct mp_log *log, int always)
{
int v = always ? MSGL_INFO : MSGL_V;
mp_msg(log, v,
"%s (C) 2000-2013 mpv/MPlayer/mplayer2 projects\n built on %s\n", mplayer_version, mplayer_builddate);
"%s (C) 2000-2013 mpv/MPlayer/mplayer2 projects\n built on %s\n",
mpv_version, mpv_builddate);
print_libav_versions(log, v);
mp_msg(log, v, "\n");
}
@@ -300,9 +301,13 @@ static int mpv_main(int argc, char *argv[])
mpctx->log = mp_log_new(mpctx, mpctx->global->log, "!cplayer");
mpctx->statusline = mp_log_new(mpctx, mpctx->log, "!statusline");
struct MPOpts *def_opts = talloc_ptrtype(mpctx, def_opts);
*def_opts = mp_default_opts;
def_opts->network_useragent = (char *)mpv_version;
// Create the config context and register the options
mpctx->mconfig = m_config_new(mpctx, mpctx->log, sizeof(struct MPOpts),
&mp_default_opts, mp_opts);
def_opts, mp_opts);
mpctx->opts = mpctx->mconfig->optstruct;
mpctx->mconfig->includefunc = cfg_include;
mpctx->mconfig->includefunc_ctx = mpctx;