[MPlayer-cvslog] r30914 - in trunk: get_path.h mencoder.c mpcommon.c mpcommon.h mplayer.c

[komh]

Author: komh
Date: Wed Mar 17 10:12:51 2010
New Revision: 30914

Log:
Follow a more proper way to support -codecpath.

    1. Include loader/drv.h for SetCodecPath() instead of a declaration of it.

    2. Move codec_path from get_path.h to mpcommon.h and mpcommon.c.

Modified:
   trunk/get_path.h
   trunk/mencoder.c
   trunk/mpcommon.c
   trunk/mpcommon.h
   trunk/mplayer.c

Modified: trunk/get_path.h
==============================================================================
--- trunk/get_path.h	Tue Mar 16 23:08:56 2010	(r30913)
+++ trunk/get_path.h	Wed Mar 17 10:12:51 2010	(r30914)
@@ -24,10 +24,4 @@
 char *get_path(const char *filename);
 void set_path_env(void);
 
-#ifdef CONFIG_WIN32DLL
-extern void SetCodecPath(const char *);   // in loader/drv.c
-
-static char *codec_path=NULL;
-#endif
-
 #endif /* MPLAYER_GET_PATH_H */

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Tue Mar 16 23:08:56 2010	(r30913)
+++ trunk/mencoder.c	Wed Mar 17 10:12:51 2010	(r30914)
@@ -65,6 +65,10 @@
 #include "mp_fifo.h"
 #include "get_path.h"
 
+#ifdef CONFIG_WIN32DLL
+#include "loader/drv.h"         // for SetCodecPath()
+#endif
+
 #include "stream/stream.h"
 #include "libmpdemux/aviprint.h"
 #include "libmpdemux/demuxer.h"

Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c	Tue Mar 16 23:08:56 2010	(r30913)
+++ trunk/mpcommon.c	Wed Mar 17 10:12:51 2010	(r30914)
@@ -313,3 +313,8 @@ const m_option_t noconfig_opts[] = {
 #endif /* CONFIG_GUI */
     {NULL, NULL, 0, 0, 0, 0, NULL}
 };
+
+#ifdef CONFIG_WIN32DLL
+char *codec_path = NULL;
+#endif
+

Modified: trunk/mpcommon.h
==============================================================================
--- trunk/mpcommon.h	Tue Mar 16 23:08:56 2010	(r30913)
+++ trunk/mpcommon.h	Wed Mar 17 10:12:51 2010	(r30914)
@@ -37,4 +37,8 @@ void set_osd_subtitle(subtitle *subs);
 extern int disable_system_conf;
 extern int disable_user_conf;
 
+#ifdef CONFIG_WIN32DLL
+extern char *codec_path;
+#endif
+
 #endif /* MPLAYER_MPCOMMON_H */

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Tue Mar 16 23:08:56 2010	(r30913)
+++ trunk/mplayer.c	Wed Mar 17 10:12:51 2010	(r30914)
@@ -95,6 +95,10 @@
 
 #include "input/input.h"
 
+#ifdef CONFIG_WIN32DLL
+#include "loader/drv.h"         // for SetCodecPath()
+#endif
+
 int slave_mode=0;
 int player_idle_mode=0;
 int quiet=0;