RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

player: silence config file loading message on resuming 

This is just an implementation detail; seems to be ugly to log it by
default. Other cases of the try_load_config() function should be logged,
though.
This commit is contained in:
wm4 2018-01-11 23:50:44 +01:00 committed by Kevin Mitchell
parent 69d062ce37
commit d53c0604ca
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
player/configfiles.c
View File

@ -82,11 +82,12 @@ void mp_parse_cfgfiles(struct MPContext *mpctx)
m_config_set_profile(conf, SECT_ENCODE, 0);
}
static int try_load_config(struct MPContext *mpctx, const char *file, int flags)
static int try_load_config(struct MPContext *mpctx, const char *file, int flags,
int msgl)
{
if (!mp_path_exists(file))
return 0;
MP_INFO(mpctx, "Loading config '%s'\n", file);
MP_MSG(mpctx, msgl, "Loading config '%s'\n", file);
m_config_parse_config_file(mpctx->mconfig, file, NULL, flags);
return 1;
}
@ -114,14 +115,14 @@ static void mp_load_per_file_config(struct MPContext *mpctx)
bstr dir = mp_dirname(cfg);
char *dircfg = mp_path_join_bstr(NULL, dir, bstr0("mpv.conf"));
try_load_config(mpctx, dircfg, FILE_LOCAL_FLAGS);
try_load_config(mpctx, dircfg, FILE_LOCAL_FLAGS, MSGL_INFO);
talloc_free(dircfg);
if (try_load_config(mpctx, cfg, FILE_LOCAL_FLAGS))
if (try_load_config(mpctx, cfg, FILE_LOCAL_FLAGS, MSGL_INFO))
return;
if ((confpath = mp_find_config_file(NULL, mpctx->global, name))) {
try_load_config(mpctx, confpath, FILE_LOCAL_FLAGS);
try_load_config(mpctx, confpath, FILE_LOCAL_FLAGS, MSGL_INFO);
talloc_free(confpath);
}
@ -405,7 +406,7 @@ void mp_load_playback_resume(struct MPContext *mpctx, const char *file)
m_config_backup_opt(mpctx->mconfig, "start");
MP_INFO(mpctx, "Resuming playback. This behavior can "
"be disabled with --no-resume-playback.\n");
try_load_config(mpctx, fname, M_SETOPT_PRESERVE_CMDLINE);
try_load_config(mpctx, fname, M_SETOPT_PRESERVE_CMDLINE, MSGL_V);
unlink(fname);
}
talloc_free(fname);