# HG changeset patch # User pontscho # Date 999257241 0 # Node ID ddeafb1dbc73c0d8394196bd20cd0c0aaaee45bb # Parent d1aabeb7274f2ea0158f1b6af2d6e859fe4f7af0 fix sub redraw diff -r d1aabeb7274f -r ddeafb1dbc73 Gui/mplayer/mw.h --- a/Gui/mplayer/mw.h Fri Aug 31 11:26:14 2001 +0000 +++ b/Gui/mplayer/mw.h Fri Aug 31 11:27:21 2001 +0000 @@ -354,7 +354,7 @@ mplMainRender=1; wsPostRedisplay( &appMPlayer.mainWindow ); // if ( !mplShMem->Playing ) - wsPostRedisplay( &appMPlayer.subWindow ); +// wsPostRedisplay( &appMPlayer.subWindow ); XFlush( wsDisplay ); mplRedrawTimer=mplRedrawTimerConst; break; diff -r d1aabeb7274f -r ddeafb1dbc73 Gui/mplayer/sw.h --- a/Gui/mplayer/sw.h Fri Aug 31 11:26:14 2001 +0000 +++ b/Gui/mplayer/sw.h Fri Aug 31 11:27:21 2001 +0000 @@ -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 ); } }