[Mplayer-cvslog] CVS: main/Gui/mplayer mw.h,1.15,1.16 sw.h,1.5,1.6

[Zoltan Ponekker]

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

Modified Files:
	mw.h sw.h 
Log Message:
fix sub redraw

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mw.h	30 Aug 2001 22:07:19 -0000	1.15
+++ mw.h	31 Aug 2001 11:27:21 -0000	1.16
@@ -354,7 +354,7 @@
         mplMainRender=1;
         wsPostRedisplay( &appMPlayer.mainWindow );
 //        if ( !mplShMem->Playing ) 
-	wsPostRedisplay( &appMPlayer.subWindow );
+//	wsPostRedisplay( &appMPlayer.subWindow );
         XFlush( wsDisplay );
 	mplRedrawTimer=mplRedrawTimerConst;
         break;

Index: sw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sw.h	30 Aug 2001 19:44:08 -0000	1.5
+++ sw.h	31 Aug 2001 11:27:21 -0000	1.6
@@ -6,17 +6,27 @@
 
 void mplSubDraw( wsParamDisplay )
 {
- if ( appMPlayer.subWindow.Visible == wsWindowNotVisible ) return;
+ if ( ( appMPlayer.subWindow.Visible == wsWindowNotVisible )||
+      ( appMPlayer.subWindow.State != wsWindowExpose ) ) return;
+
  if ( ( mplShMem->Playing )&&( appMPlayer.subWindow.State == wsWindowExpose ) )
-  { appMPlayer.subWindow.State=0; vo_expose=1; return; }
+  { 
+   wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
+   wsClearWindow( appMPlayer.subWindow );
+   appMPlayer.subWindow.State=0; 
+   vo_expose=1; 
+   return; 
+  }
 
  if ( mplSubRender )
   {
    wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
    wsClearWindow( appMPlayer.subWindow );
-   if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );
-   mplSubRender=0;
-   if ( appMPlayer.sub.Bitmap.Image ) wsPutImage( &appMPlayer.subWindow );
+   if ( appMPlayer.sub.Bitmap.Image ) 
+    {
+     wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );
+     wsPutImage( &appMPlayer.subWindow );
+    } 
    XFlush( wsDisplay );
   }
 }