[MPlayer-cvslog] r29634 - trunk/mplayer.c

[reimar]

Author: reimar
Date: Wed Sep  2 21:43:05 2009
New Revision: 29634

Log:
Add support for directory-specific mplayer.conf configuration file.
Patch by Christian P. Schmidt "schmidt digadd de"

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Wed Sep  2 19:49:24 2009	(r29633)
+++ trunk/mplayer.c	Wed Sep  2 21:43:05 2009	(r29634)
@@ -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_conf
 
     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_conf
     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);