[Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.c,1.17,1.18

[Zoltan Ponekker]

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

Modified Files:
	mplayer.c 
Log Message:
bug fixs

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mplayer.c	18 Nov 2001 15:05:25 -0000	1.17
+++ mplayer.c	23 Nov 2001 01:41:45 -0000	1.18
@@ -74,9 +74,12 @@
 
  wsCreateWindow( &appMPlayer.subWindow,
   appMPlayer.sub.x,appMPlayer.sub.y,appMPlayer.sub.width,appMPlayer.sub.height,
-  wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsShowFrame|wsShowWindow,"ViDEO" );
+  wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsShowFrame|wsHideWindow,"ViDEO" );
 
- vo_setwindow(appMPlayer.subWindow.WindowID, appMPlayer.subWindow.wGC);
+ wsDestroyImage( &appMPlayer.subWindow );
+ 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;
@@ -86,7 +89,6 @@
   wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,i,"MPlayer" ); //wsMinSize|
 
  wsSetShape( &appMPlayer.mainWindow,appMPlayer.main.Mask.Image );
- wsVisibleWindow( &appMPlayer.mainWindow,wsShowWindow );
  
  mplMenuInit();
 
@@ -106,6 +108,7 @@
  appMPlayer.subWindow.ReSize=mplResize;
 
  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 );
 
  wsPostRedisplay( &appMPlayer.mainWindow );
@@ -116,12 +119,9 @@
  btnModify( evSetMoviePosition,mplShMem->Position );
 
  mplShMem->Playing=0;
- 
-// timerSetHandler( mplTimerHandler );  // various timer hacks
-// timerInit();
-
-// wsMainLoop();  // X event handler (calls mplTimerHandler periodically!)
 
+ wsVisibleWindow( &appMPlayer.mainWindow,wsShowWindow );
+ wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
 }
 
 void mplDone(){