10l+

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

4 files changed, 2 insertions, 10 deletions

diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c
index 99e3e29613..ac6552f0a6 100644
--- a/Gui/mplayer/mplayer.c
+++ b/Gui/mplayer/mplayer.c
@@ -81,7 +81,6 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp )
  wsCreateImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height );
 
  vo_setwindow( appMPlayer.subWindow.WindowID, appMPlayer.subWindow.wGC );
- vo_setwindowsize( appMPlayer.sub.width,appMPlayer.sub.height );
  
  i=wsHideFrame|wsMaxSize|wsHideWindow;
  if ( appMPlayer.mainDecoration ) i=wsShowFrame|wsMaxSize|wsHideWindow;
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index ec7d52204c..0eaef673d7 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -126,9 +126,6 @@ void mplState( void )
 
 void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height )
 {
-// printf( "----resize---> %dx%d --- \n",width,height );
- vo_setwindowsize( width,height );
- vo_resize=1;
 }
 
 void mplMPlayerInit( int argc,char* argv[], char *envp[] )
diff --git a/Gui/mplayer/psignal.h b/Gui/mplayer/psignal.h
index 91b6bf7c94..8e7f8639d8 100644
--- a/Gui/mplayer/psignal.h
+++ b/Gui/mplayer/psignal.h
@@ -42,7 +42,7 @@
 #ifndef SIGTYPE
 #ifdef SIGUSR2
 #define	SIGTYPE SIGUSR2
-#warning should we use SIGUSR1 or SIGUSR2 on linux, bsd, ... too?
+//#warning should we use SIGUSR1 or SIGUSR2 on linux, bsd, ... too?
 #else
 #ifdef	__bsdi__
 #define	_NSIG NSIG
diff --git a/Gui/mplayer/sw.h b/Gui/mplayer/sw.h
index 8b195203d6..85ae30820d 100644
--- a/Gui/mplayer/sw.h
+++ b/Gui/mplayer/sw.h
@@ -11,11 +11,7 @@ void mplSubDraw( wsParamDisplay )
  if ( !appMPlayer.subWindow.Mapped ||
       appMPlayer.subWindow.Visible == wsWindowNotVisible ) return;
 
- if ( mplShMem->Playing )
-  {
-   vo_expose=1;
-   mplSubRender=0;
-  }
+ if ( mplShMem->Playing ) mplSubRender=0;
 
  if ( mplSubRender )
   {