[Mplayer-cvslog] CVS: main/Gui/mplayer mw.h,1.26,1.27 play.c,1.35,1.36 sw.h,1.16,1.17

[Zoltan Ponekker]

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

Modified Files:
	mw.h play.c sw.h 
Log Message:
fix other bugs

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mw.h	12 Sep 2001 22:12:05 -0000	1.26
+++ mw.h	2 Oct 2001 15:01:36 -0000	1.27
@@ -17,7 +17,7 @@
  static char   trbuf[512];
         char   tmp[128];
         int    i,c;
-        int    t,h,m,s;
+        int    t;
  memset( trbuf,0,512 );
  memset( tmp,0,128 );
  for ( c=0,i=0;i < strlen( str );i++ )

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- play.c	1 Oct 2001 12:28:23 -0000	1.35
+++ play.c	2 Oct 2001 15:01:36 -0000	1.36
@@ -52,6 +52,8 @@
     wsWindowDecoration( &appMPlayer.subWindow,0 );
     appMPlayer.subWindow.isFullScreen=1;
    }
+ if ( mplShMem->Playing ) wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
+  else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
  wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
  mplResize( 0,0,appMPlayer.subWindow.Width,appMPlayer.subWindow.Height );
 }
@@ -71,8 +73,8 @@
    wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
   }
  mplSubRender=1;
- wsClearWindow( appMPlayer.subWindow );
  wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
+ wsClearWindow( appMPlayer.subWindow );
  wsPostRedisplay( &appMPlayer.subWindow );
 }
 

Index: sw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sw.h	1 Oct 2001 13:08:45 -0000	1.16
+++ sw.h	2 Oct 2001 15:01:36 -0000	1.17
@@ -6,7 +6,8 @@
 
 void mplSubDraw( wsParamDisplay )
 {
- if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible=0;
+ if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible++;
+ 
  if ( !appMPlayer.subWindow.Mapped ||
       appMPlayer.subWindow.Visible == wsWindowNotVisible ) return;
 
@@ -64,8 +65,16 @@
 //          if ( ( !mplSubMoved )&&( ( SubVisible++%2 ) ) ) wsMoveTopWindow( &appMPlayer.mainWindow );
           if ( !mplSubMoved )
 	   {
-	    if( SubVisible++%2 ) wsMoveTopWindow( &appMPlayer.subWindow );
-	     else wsMoveTopWindow( &appMPlayer.mainWindow );
+	    if( SubVisible++%2 )
+	     {
+	      wsMoveTopWindow( &appMPlayer.mainWindow );
+	      fprintf( stderr,"[sw] MAIN TOP\n" );
+	     } 
+	     else 
+	      {
+	       wsMoveTopWindow( &appMPlayer.subWindow );
+	       fprintf( stderr,"[sw] SUB TOP\n" );
+	      }
 	   }
           msButton=0;
           mplSubMoved=0;