[MPlayer-cvslog] r19814 - in trunk: mplayer.c osdep/getch2.h parser-cfg.h parser-mpcmd.h stream/cache2.h stream/stream.c

[attila]

Author: attila
Date: Tue Sep 12 18:24:23 2006
New Revision: 19814

Added:
   trunk/parser-cfg.h
   trunk/parser-mpcmd.h
   trunk/stream/cache2.h
Modified:
   trunk/mplayer.c
   trunk/osdep/getch2.h
   trunk/stream/stream.c

Log:
* remove extern definitions of functions in .c files
* create new .h files where necessary

todo:
* go trough other files than mplayer.c
* vf_menu_pause_update()
* mp_input_register_options()
* import_playtree_playlist_into_gui()
* import_initial_playtree_into_gui()

For more infos see http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2006-September/045683.html
( 20060902133225.2cc82aec.attila at kinali.ch on -dev-eng )


Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Tue Sep 12 18:24:23 2006
@@ -85,7 +85,6 @@
 
 int slave_mode=0;
 int player_idle_mode=0;
-extern int verbose;
 int quiet=0;
 
 #ifdef WIN32
@@ -116,7 +115,7 @@
 #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 @@
 //**************************************************************************//
 //             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 @@
 #include "libmpcodecs/vf.h"
 #include "libmpcodecs/vd.h"
 
-extern void vf_list_plugins(void);
-
 //**************************************************************************//
 //**************************************************************************//
 
@@ -805,8 +800,6 @@
   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"

Modified: trunk/osdep/getch2.h
==============================================================================
--- trunk/osdep/getch2.h	(original)
+++ trunk/osdep/getch2.h	Tue Sep 12 18:24:23 2006
@@ -21,3 +21,6 @@
 /* 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

Added: trunk/parser-cfg.h
==============================================================================
--- (empty file)
+++ trunk/parser-cfg.h	Tue Sep 12 18:24:23 2006
@@ -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

Added: trunk/parser-mpcmd.h
==============================================================================
--- (empty file)
+++ trunk/parser-mpcmd.h	Tue Sep 12 18:24:23 2006
@@ -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

Added: trunk/stream/cache2.h
==============================================================================
--- (empty file)
+++ trunk/stream/cache2.h	Tue Sep 12 18:24:23 2006
@@ -0,0 +1,6 @@
+#ifndef _cache2_h
+#define _cache2_h
+
+extern void cache_uninit(stream_t *s);
+
+#endif

Modified: trunk/stream/stream.c
==============================================================================
--- trunk/stream/stream.c	(original)
+++ trunk/stream/stream.c	Tue Sep 12 18:24:23 2006
@@ -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"