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.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30914 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
komh 2010-03-17 09:12:51 +00:00
parent f414a15b33
commit 11eeaf5005
5 changed files with 17 additions and 6 deletions

View File

@ -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 */

View File

@ -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"

View File

@ -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

View File

@ -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 */

View File

@ -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;