[Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.c,1.14,1.15 mplayer.h,1.2,1.3 play.c,1.36,1.37

[Zoltan Ponekker]

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

Modified Files:
	mplayer.c mplayer.h play.c 
Log Message:
skin chaning bug fix.

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mplayer.c	1 Oct 2001 12:28:23 -0000	1.14
+++ mplayer.c	16 Oct 2001 21:23:59 -0000	1.15
@@ -27,8 +27,6 @@
 int mplGeneralTimer = -1;
 int mplTimer = 0;
 
-int mplSkinChanged = 0;
-
 void mplMsgHandle( int msg,float param );
 
 #include "widgets.h"

Index: mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer.h	27 Aug 2001 23:56:43 -0000	1.2
+++ mplayer.h	16 Oct 2001 21:23:59 -0000	1.3
@@ -5,7 +5,6 @@
 extern int             mplSubRender;
 extern int             mplMainRender;
 extern int             mplGeneralTimer;
-extern int             mplSkinChanged;
 
 extern unsigned char * mplDrawBuffer;
 extern unsigned char * mplMenuDrawBuffer;

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- play.c	2 Oct 2001 15:01:36 -0000	1.36
+++ play.c	16 Oct 2001 21:23:59 -0000	1.37
@@ -178,11 +178,10 @@
    wsResizeImage( &appMPlayer.menuWindow,appMPlayer.menuBase.width,appMPlayer.menuBase.height );
   }
 
- mplSkinChanged=1;
+/*
  if ( appMPlayer.sub.Bitmap.Image ) wsResizeImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height );
  if ( !mplShMem->Playing )
   {
-   mplSkinChanged=0;
    if ( !appMPlayer.subWindow.isFullScreen ) 
     {
      wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
@@ -192,6 +191,21 @@
    wsClearWindow( appMPlayer.subWindow );
    if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );
    mplSubRender=1; wsPostRedisplay( &appMPlayer.subWindow );
+  }
+*/
+ if ( appMPlayer.sub.Bitmap.Image ) wsResizeImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height );
+ if ( ( !appMPlayer.subWindow.isFullScreen )&&( !mplShMem->Playing ) )
+  {
+   wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
+   wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
+  } 
+ wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
+ if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );
+ if ( !mplShMem->Playing ) 
+  {
+   mplSubRender=1; 
+   wsClearWindow( appMPlayer.subWindow );
+   wsPostRedisplay( &appMPlayer.subWindow );
   }
 
  if ( mplDrawBuffer ) free( mplDrawBuffer );