[Mplayer-cvslog] CVS: main/Gui/mplayer menu.c,1.14,1.15 mplayer.h,1.7,1.8 mw.c,1.87,1.88 sw.c,1.37,1.38 mplayer.c,1.36,NONE

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mail:/var/tmp.root/cvs-serv11462/Gui/mplayer

Modified Files:
	menu.c mplayer.h mw.c sw.c 
Removed Files:
	mplayer.c 
Log Message:
cosmetic

Index: menu.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/menu.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- menu.c	28 May 2002 14:12:32 -0000	1.14
+++ menu.c	2 Nov 2002 20:10:16 -0000	1.15
@@ -1,4 +1,15 @@
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <inttypes.h>
+
+#include "../app.h"
+#include "../../config.h"
+#include "../../help_mp.h"
+#include "../../mp_msg.h"
+
+#include "widgets.h"
+
 unsigned char * mplMenuDrawBuffer = NULL;
 int             mplMenuRender = 1;
 int             mplMenuItem = -1;
@@ -7,7 +18,7 @@
 
 void mplHideMenu( int mx,int my,int w );
 
-void mplMenuDraw( wsParamDisplay )
+void mplMenuDraw( void )
 {
  uint32_t * buf = NULL;
  uint32_t * drw = NULL;

Index: mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mplayer.h	2 Jul 2002 13:35:03 -0000	1.7
+++ mplayer.h	2 Nov 2002 20:10:16 -0000	1.8
@@ -15,4 +15,18 @@
 extern void mplInit( void * disp );
 extern void mplEventHandling( int msg,float param );
 
+extern void mplMainDraw( void );
+extern void mplEventHandling( int msg,float param );
+extern void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY );
+extern void mplMainKeyHandle( int KeyCode,int Type,int Key );
+extern void mplDandDHandler(int num,char** files);
+
+extern void mplSubDraw( void );
+extern void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY );
+
+extern void mplMenuInit( void );
+extern void mplHideMenu( int mx,int my,int w );
+extern void mplShowMenu( int mx,int my );
+extern void mplMenuMouseHandle( int X,int Y,int RX,int RY );
+
 #endif

Index: mw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- mw.c	2 Nov 2002 18:57:14 -0000	1.87
+++ mw.c	2 Nov 2002 20:10:16 -0000	1.88
@@ -24,9 +24,6 @@
 #include "widgets.h"
 
 extern unsigned int GetTimerMS( void );
-extern void mplHideMenu( int mx,int my,int w );
-extern void mplShowMenu( int mx,int my );
-extern void mplMenuMouseHandle( int X,int Y,int RX,int RY );
 
 unsigned char * mplDrawBuffer = NULL;
 int             mplMainRender = 1;
@@ -177,7 +174,7 @@
    }
 }
 
-void mplMainDraw( wsParamDisplay )
+void mplMainDraw( void )
 {
  wItem    * item;
  txSample * image = NULL;

Index: sw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sw.c	2 Nov 2002 18:57:14 -0000	1.37
+++ sw.c	2 Nov 2002 20:10:16 -0000	1.38
@@ -13,11 +13,7 @@
 extern int             sx,sy;
 extern int             i,pot;
 
-extern void mplHideMenu( int mx,int my,int w );
-extern void mplShowMenu( int mx,int my );
-extern void mplMenuMouseHandle( int X,int Y,int RX,int RY );
-
-void mplSubDraw( wsParamDisplay )
+void mplSubDraw( void )
 {
  if ( appMPlayer.subWindow.State == wsWindowClosed ) exit_player( MSGTR_Exit_quit );
  

--- mplayer.c DELETED ---