[Mplayer-cvslog] CVS: main/Gui/mplayer play.c,1.86,1.87 play.h,1.29,1.30

[Zoltan Ponekker]

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

Modified Files:
	play.c play.h 
Log Message:


From: Michael Joosten <joost at c-lab.de>
PATCH: fullscreen issues with GUI, WM layers, gmplayer plays first file always twice


Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- play.c	5 Feb 2003 23:01:02 -0000	1.86
+++ play.c	26 May 2003 08:34:15 -0000	1.87
@@ -32,7 +32,7 @@
 extern float rel_seek_secs;
 extern int abs_seek_pos;
 
-static int mplGotoTheNext = 1;
+int mplGotoTheNext = 1;
 
 void mplFullScreen( void )
 {
@@ -57,7 +57,7 @@
   if ( guiIntfStruct.Playing || gtkShowVideoWindow ) wsFullScreen( &appMPlayer.subWindow );
   fullscreen=vo_fs=appMPlayer.subWindow.isFullScreen;
   wsSetLayer( wsDisplay,appMPlayer.mainWindow.WindowID,appMPlayer.subWindow.isFullScreen );
-  wsSetLayer( wsDisplay,appMPlayer.menuWindow.WindowID,appMPlayer.subWindow.isFullScreen );
+  if ( appMPlayer.menuIsPresent ) wsSetLayer( wsDisplay,appMPlayer.menuWindow.WindowID,appMPlayer.subWindow.isFullScreen );
 
  if ( guiIntfStruct.Playing ) wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
   else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.sub.R,appMPlayer.sub.G,appMPlayer.sub.B );

Index: play.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- play.h	5 Feb 2003 23:01:02 -0000	1.29
+++ play.h	26 May 2003 08:34:15 -0000	1.30
@@ -6,6 +6,8 @@
 
 #include "./mplayer.h"
 
+extern int mplGotoTheNext;
+
 extern void mplEnd( void );
 extern void mplFullScreen( void );
 extern void mplPlay( void );