not needed

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8056 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 41 insertions, 29 deletions

diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c
index 543384837b..6001710e5b 100644
--- a/Gui/mplayer/mplayer.c
+++ b/Gui/mplayer/mplayer.c
@@ -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 )
 {
diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c
index fd0656bd7a..aff15a8397 100644
--- a/Gui/mplayer/mw.c
+++ b/Gui/mplayer/mw.c
@@ -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 @@ set_volume:
    case evRedraw:
         mplMainRender=1;
         wsPostRedisplay( &appMPlayer.mainWindow );
-        mplRedrawTimer=mplRedrawTimerConst;
         break;
 // --- system events
 #ifdef MP_DEBUG
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index a7ea92db51..4685cc7705 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -16,7 +16,6 @@
 #include "../app.h"
 
 #include "../wm/wskeys.h"
-#include "../wm/widget.h"
 #include "../interface.h"
 
 #include "widgets.h"
diff --git a/Gui/mplayer/sw.c b/Gui/mplayer/sw.c
index 7a404d09ca..2593fede4d 100644
--- a/Gui/mplayer/sw.c
+++ b/Gui/mplayer/sw.c
@@ -1,9 +1,22 @@
 
 // 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 )
 {
  if ( appMPlayer.subWindow.State == wsWindowClosed ) exit_player( MSGTR_Exit_quit );