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

Add support for directory-specific mplayer.conf configuration file. 

Patch by Christian P. Schmidt "schmidt digadd de"


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29634 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-09-02 19:43:05 +00:00
parent 758980965c
commit 7e8ff35fd2
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mplayer.c
View File

@ -48,6 +48,7 @@
#include "cfg-mplayer-def.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/avstring.h"
#include "subreader.h"
@ -935,9 +936,6 @@ static void load_per_file_config (m_config_t* conf, const char *const file)
sprintf (cfg, "%s.conf", file);
if (use_filedir_conf && try_load_config(conf, cfg))
return;
name = strrchr(cfg, '/');
if (HAVE_DOS_PATHS) {
char *tmp = strrchr(cfg, '\\');
@ -952,6 +950,16 @@ static void load_per_file_config (m_config_t* conf, const char *const file)
else
name++;
if (use_filedir_conf) {
char dircfg[strlen(file)+14];
strcpy(dircfg, cfg);
strcpy(dircfg + (name - cfg), "mplayer.conf");
try_load_config(conf, dircfg);
if (try_load_config(conf, cfg))
return;
}
if ((confpath = get_path (name)) != NULL)
{
try_load_config(conf, confpath);