[Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.c,1.19,1.20 play.c,1.44,1.45 psignal.h,1.6,1.7 sw.h,1.25,1.26

[Zoltan Ponekker]

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

Modified Files:
	mplayer.c play.c psignal.h sw.h 
Log Message:
10l+

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mplayer.c	31 Jan 2002 08:39:13 -0000	1.19
+++ mplayer.c	21 Feb 2002 21:20:52 -0000	1.20
@@ -81,7 +81,6 @@
  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;

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- play.c	1 Feb 2002 16:34:15 -0000	1.44
+++ play.c	21 Feb 2002 21:20:52 -0000	1.45
@@ -126,9 +126,6 @@
 
 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[] )

Index: psignal.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/psignal.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- psignal.h	6 Oct 2001 16:20:28 -0000	1.6
+++ psignal.h	21 Feb 2002 21:20:52 -0000	1.7
@@ -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

Index: sw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sw.h	12 Dec 2001 23:53:44 -0000	1.25
+++ sw.h	21 Feb 2002 21:20:52 -0000	1.26
@@ -11,11 +11,7 @@
  if ( !appMPlayer.subWindow.Mapped ||
       appMPlayer.subWindow.Visible == wsWindowNotVisible ) return;
 
- if ( mplShMem->Playing )
-  {
-   vo_expose=1;
-   mplSubRender=0;
-  }
+ if ( mplShMem->Playing ) mplSubRender=0;
 
  if ( mplSubRender )
   {