diff options
| -rw-r--r-- | mplayer.c | 15 | ||||
| -rw-r--r-- | osdep/getch2.h | 3 | ||||
| -rw-r--r-- | parser-cfg.h | 6 | ||||
| -rw-r--r-- | parser-mpcmd.h | 6 | ||||
| -rw-r--r-- | stream/cache2.h | 6 | ||||
| -rw-r--r-- | stream/stream.c | 3 |
6 files changed, 26 insertions, 13 deletions
@@ -85,7 +85,6 @@ extern int mp_input_win32_slave_cmd_func(int fd,char* dest,int size); int slave_mode=0; int player_idle_mode=0; -extern int verbose; int quiet=0; #ifdef WIN32 @@ -116,7 +115,7 @@ char * proc_priority=NULL; #include "stream/dvbin.h" static int last_dvb_step = 1; static int dvbin_reopen = 0; -extern void cache_uninit(stream_t *s); +#include "stream/cache2.h" #endif //**************************************************************************// @@ -144,12 +143,10 @@ static int play_tree_step = 1; //**************************************************************************// // Config //**************************************************************************// -m_config_t* mconfig; +#include "parser-cfg.h" +#include "parser-mpcmd.h" -extern play_tree_t* -m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv); -extern int -m_config_parse_config_file(m_config_t* config, char *conffile); +m_config_t* mconfig; //**************************************************************************// // Config file @@ -194,8 +191,6 @@ static int max_framesize=0; #include "libmpcodecs/vf.h" #include "libmpcodecs/vd.h" -extern void vf_list_plugins(void); - //**************************************************************************// //**************************************************************************// @@ -805,8 +800,6 @@ static void exit_sighandler(int x){ exit_player(NULL); } -//extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height); - extern void mp_input_register_options(m_config_t* cfg); #include "mixer.h" diff --git a/osdep/getch2.h b/osdep/getch2.h index 75bf463cc1..66ace32da0 100644 --- a/osdep/getch2.h +++ b/osdep/getch2.h @@ -21,3 +21,6 @@ extern void getch2_disable(void); /* Read a character or a special key code (see keycodes.h) */ extern int getch2(int halfdelay_time); +#ifdef __MINGW32__ +extern int mp_input_win32_slave_cmd_func(int fd,char* dest,int size); +#endif diff --git a/parser-cfg.h b/parser-cfg.h new file mode 100644 index 0000000000..bd537806cb --- /dev/null +++ b/parser-cfg.h @@ -0,0 +1,6 @@ +#ifndef _parser_cfg_h +#define _parser_cfg_h + +extern int m_config_parse_config_file(m_config_t* config, char *conffile); + +#endif diff --git a/parser-mpcmd.h b/parser-mpcmd.h new file mode 100644 index 0000000000..0e3f35676e --- /dev/null +++ b/parser-mpcmd.h @@ -0,0 +1,6 @@ +#ifndef _parser_mpcmd_h +#define _parser_mpcmd_h + +extern play_tree_t* m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv); + +#endif diff --git a/stream/cache2.h b/stream/cache2.h new file mode 100644 index 0000000000..d8bffc9a50 --- /dev/null +++ b/stream/cache2.h @@ -0,0 +1,6 @@ +#ifndef _cache2_h +#define _cache2_h + +extern void cache_uninit(stream_t *s); + +#endif diff --git a/stream/stream.c b/stream/stream.c index a25b1a1f37..4b3db771ac 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -31,8 +31,7 @@ #include "m_option.h" #include "m_struct.h" - -void cache_uninit(stream_t *s); // defined in cache2.c +#include "cache2.h" //#include "vcd_read_bincue.h" |