[MPlayer-cvslog] r26225 - in trunk/gui/win32: dialogs.c gui.c gui.h interface.c playlist.c preferences.c wincfg.c

[vayne]

Author: vayne
Date: Tue Mar 11 19:46:52 2008
New Revision: 26225

Log:
more header / declaration cleanups; fixes a lot of warnings as well as a preempt to removal of redundant wincfg.h.

Modified:
   trunk/gui/win32/dialogs.c
   trunk/gui/win32/gui.c
   trunk/gui/win32/gui.h
   trunk/gui/win32/interface.c
   trunk/gui/win32/playlist.c
   trunk/gui/win32/preferences.c
   trunk/gui/win32/wincfg.c

Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c	(original)
+++ trunk/gui/win32/dialogs.c	Tue Mar 11 19:46:52 2008
@@ -23,7 +23,7 @@
 
 #include <windows.h>
 #include <commctrl.h>
-
+#include <get_path.h>
 #include "interface.h"
 #include "mp_msg.h"
 #include "help_mp.h"
@@ -31,7 +31,6 @@
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
 #include "gui.h"
-#include "wincfg.h"
 #include "dialogs.h"
 #include "libvo/sub.h"
 

Modified: trunk/gui/win32/gui.c
==============================================================================
--- trunk/gui/win32/gui.c	(original)
+++ trunk/gui/win32/gui.c	Tue Mar 11 19:46:52 2008
@@ -41,7 +41,6 @@
 #include "libvo/video_out.h"
 #include "interface.h"
 #include "gui.h"
-#include "wincfg.h"
 #include "dialogs.h"
 
 // HACK around bug in old mingw
@@ -57,9 +56,7 @@
 /* Globals / Externs */
 extern void renderinfobox(skin_t *skin, window_priv_t *priv);
 extern void renderwidget(skin_t *skin, image *dest, widget *item, int state);
-extern void mplayer_put_key(int code);
 extern void print_version(void);
-extern int WinID;
 float sub_aspect;
 
 DWORD oldtime;

Modified: trunk/gui/win32/gui.h
==============================================================================
--- trunk/gui/win32/gui.h	(original)
+++ trunk/gui/win32/gui.h	Tue Mar 11 19:46:52 2008
@@ -35,7 +35,8 @@ extern char *skinName;
 extern float sub_aspect;
 extern play_tree_t* playtree;
 extern m_config_t* mconfig;
-
+extern int sub_window;
+extern int console;
 extern NOTIFYICONDATA nid;
 
 typedef struct window_priv_t window_priv_t;

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	(original)
+++ trunk/gui/win32/interface.c	Tue Mar 11 19:46:52 2008
@@ -22,7 +22,7 @@
  */
 
 #include <windows.h>
-
+#include <get_path.h>
 #include "interface.h"
 #include "m_option.h"
 #include "mixer.h"
@@ -41,7 +41,6 @@
 #include "access_mpcontext.h"
 #include "gui.h"
 #include "dialogs.h"
-#include "wincfg.h"
 #ifdef HAVE_LIBCDIO
 #include <cdio/cdio.h>
 #endif

Modified: trunk/gui/win32/playlist.c
==============================================================================
--- trunk/gui/win32/playlist.c	(original)
+++ trunk/gui/win32/playlist.c	Tue Mar 11 19:46:52 2008
@@ -22,7 +22,7 @@
  */
 
 #include <windows.h>
-
+#include <stdio.h>
 #include "mp_msg.h"
 #include "playlist.h"
 

Modified: trunk/gui/win32/preferences.c
==============================================================================
--- trunk/gui/win32/preferences.c	(original)
+++ trunk/gui/win32/preferences.c	Tue Mar 11 19:46:52 2008
@@ -35,7 +35,6 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "dialogs.h"
-#include "wincfg.h"
 
 extern char  *proc_priority;
 

Modified: trunk/gui/win32/wincfg.c
==============================================================================
--- trunk/gui/win32/wincfg.c	(original)
+++ trunk/gui/win32/wincfg.c	Tue Mar 11 19:46:52 2008
@@ -21,9 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <windows.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include <get_path.h>
 #include "mplayer.h"
 #include "mp_msg.h"
 #include "help_mp.h"
@@ -31,8 +32,8 @@
 #include "m_option.h"
 #include "libvo/video_out.h"
 #include "mixer.h"
-#include "wincfg.h"
 #include "interface.h"
+#include "gui.h"
 
 /* params */
 int   gtkAONorm = 0;
@@ -53,7 +54,6 @@ int gui_sub_pos_x = -1;
 int gui_sub_pos_y = -1;
 
 /* External functions */
-extern int frame_dropping;
 extern char *proc_priority;
 extern int m_config_parse_config_file(m_config_t *config, char *conffile);