[Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.c,1.35,1.36 mw.c,1.86,1.87 play.c,1.76,1.77 sw.c,1.36,1.37 menu.h,1.14,NONE

[Zoltan Ponekker]

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

Modified Files:
	mplayer.c mw.c play.c sw.c 
Removed Files:
	menu.h 
Log Message:
not needed

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mplayer.c	2 Nov 2002 16:09:04 -0000	1.35
+++ mplayer.c	2 Nov 2002 18:57:14 -0000	1.36
@@ -1,47 +1,28 @@
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <inttypes.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 
-#include "./mplayer.h"
 #include "../app.h"
-#include "../cfg.h"
-#include "../interface.h"
 #include "../skin/skin.h"
-#include "../skin/font.h"
 #include "../wm/ws.h"
-#include "../wm/wskeys.h"
-#include "../wm/widget.h"
 #include "../wm/wsxdnd.h"
-#include "../bitmap/bitmap.h"
 
 #include "../../config.h"
 #include "../../help_mp.h"
 #include "../../libvo/x11_common.h"
-#include "../../libmpdemux/stream.h"
-#include "../../mp_msg.h"
-
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-#define mplRedrawTimerConst 5
-
-int mplRedrawTimer = mplRedrawTimerConst;
 
 void mplEventHandling( int msg,float param );
 
+extern void mplMainDraw( wsParamDisplay );
+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( wsParamDisplay );
+extern void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY );
+
 #include "widgets.h"
 #include "play.h"
 #include "menu.h"
-#include "mw.h"
-#include "sw.h"
-#include "widgets.h"
 
 void mplInit( void * disp )
 {

Index: mw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mw.c	2 Nov 2002 16:09:04 -0000	1.86
+++ mw.c	2 Nov 2002 18:57:14 -0000	1.87
@@ -1,12 +1,32 @@
 
 // main window
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "../app.h"
+#include "../skin/font.h"
+#include "../wm/ws.h"
+
+#include "../../config.h"
+#include "../../help_mp.h"
+#include "../../libvo/x11_common.h"
+
 #include "../../libmpdemux/stream.h"
 #include "../../mixer.h"
 #include "../../libvo/sub.h"
 #include "../../mplayer.h"
 
+#include "play.h"
+#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;
@@ -470,7 +490,6 @@
    case evRedraw:
         mplMainRender=1;
         wsPostRedisplay( &appMPlayer.mainWindow );
-        mplRedrawTimer=mplRedrawTimerConst;
         break;
 // --- system events
 #ifdef MP_DEBUG

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- play.c	29 Aug 2002 23:15:23 -0000	1.76
+++ play.c	2 Nov 2002 18:57:14 -0000	1.77
@@ -16,7 +16,6 @@
 #include "../app.h"
 
 #include "../wm/wskeys.h"
-#include "../wm/widget.h"
 #include "../interface.h"
 
 #include "widgets.h"

Index: sw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sw.c	25 Jul 2002 20:26:34 -0000	1.36
+++ sw.c	2 Nov 2002 18:57:14 -0000	1.37
@@ -1,8 +1,21 @@
 
 // sub window
 
+#include "../app.h"
+#include "../interface.h"
+#include "../../help_mp.h"
+#include "widgets.h"
+
 int             mplSubRender = 0;
 int             SubVisible = 0;
+
+extern int             boxMoved;
+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 )
 {

--- menu.h DELETED ---