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

mplayer: don't make restored options from quit_watch_later per-file local 

Consider:

    mpv file1.mkv file2.mkv

and file1.mkv is restored from an earlier session when quit_watch_later
was used. Then all restored options were reset when file2.mkv is played,
even if the user changed them during playback. This affects for example
the fullscreen setting.

Make it so that after finishing a resumed file, the previously restored
settings are not reset again. (Which means only resuming will forcefully
overwrite the settings.)
This commit is contained in:
wm4 2013-08-17 21:56:39 +02:00
parent b018c7d936
commit 6bbcb861fa
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mpvcore/mplayer.c
View File

@ -739,12 +739,12 @@ static void load_per_output_config(m_config_t *conf, char *cfg, char *out)
* Tries to load a config file (in file local mode) * Tries to load a config file (in file local mode)
* @return 0 if file was not found, 1 otherwise * @return 0 if file was not found, 1 otherwise
*/ */
static int try_load_config(m_config_t *conf, const char *file) static int try_load_config(m_config_t *conf, const char *file, bool local)
{ {
if (!mp_path_exists(file)) if (!mp_path_exists(file))
return 0; return 0;
mp_tmsg(MSGT_CPLAYER, MSGL_INFO, "Loading config '%s'\n", file); mp_tmsg(MSGT_CPLAYER, MSGL_INFO, "Loading config '%s'\n", file);
m_config_parse_config_file(conf, file, M_SETOPT_BACKUP); m_config_parse_config_file(conf, file, local ? M_SETOPT_BACKUP : 0);
return 1; return 1;
} }
@ -767,14 +767,14 @@ static void load_per_file_config(m_config_t *conf, const char * const file,
char dircfg[MP_PATH_MAX]; char dircfg[MP_PATH_MAX];
strcpy(dircfg, cfg); strcpy(dircfg, cfg);
strcpy(dircfg + (name - cfg), "mpv.conf"); strcpy(dircfg + (name - cfg), "mpv.conf");
try_load_config(conf, dircfg); try_load_config(conf, dircfg, true);
if (try_load_config(conf, cfg)) if (try_load_config(conf, cfg, true))
return; return;
} }
if ((confpath = mp_find_user_config_file(name)) != NULL) { if ((confpath = mp_find_user_config_file(name)) != NULL) {
try_load_config(conf, confpath); try_load_config(conf, confpath, true);
talloc_free(confpath); talloc_free(confpath);
} }
@ -889,7 +889,9 @@ static void load_playback_resume(m_config_t *conf, const char *file)
{ {
char *fname = get_playback_resume_config_filename(file); char *fname = get_playback_resume_config_filename(file);
if (fname) { if (fname) {
try_load_config(conf, fname); // Never apply the saved start position to following files
m_config_backup_opt(conf, "start");
try_load_config(conf, fname, false);
unlink(fname); unlink(fname);
} }
talloc_free(fname); talloc_free(fname);