diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-16 21:23:59 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-16 21:23:59 +0000 |
commit | d5ce7add8ad1b455957dd89382f3e55d0d46ee02 (patch) | |
tree | fde01b5e359a2219e40f91c73b61548917d1769d /Gui/mplayer | |
parent | 833b109e49b549a4992e02de3e15471c707da14f (diff) | |
download | mpv-d5ce7add8ad1b455957dd89382f3e55d0d46ee02.tar.bz2 mpv-d5ce7add8ad1b455957dd89382f3e55d0d46ee02.tar.xz |
skin chaning bug fix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2227 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer')
-rw-r--r-- | Gui/mplayer/mplayer.c | 2 | ||||
-rw-r--r-- | Gui/mplayer/mplayer.h | 1 | ||||
-rw-r--r-- | Gui/mplayer/play.c | 18 |
3 files changed, 16 insertions, 5 deletions
diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c index 41873d667e..150eae1542 100644 --- a/Gui/mplayer/mplayer.c +++ b/Gui/mplayer/mplayer.c @@ -27,8 +27,6 @@ int mplRedrawTimer = mplRedrawTimerConst; int mplGeneralTimer = -1; int mplTimer = 0; -int mplSkinChanged = 0; - void mplMsgHandle( int msg,float param ); #include "widgets.h" diff --git a/Gui/mplayer/mplayer.h b/Gui/mplayer/mplayer.h index 65744629d3..b98b178b1b 100644 --- a/Gui/mplayer/mplayer.h +++ b/Gui/mplayer/mplayer.h @@ -5,7 +5,6 @@ extern int mplSubRender; extern int mplMainRender; extern int mplGeneralTimer; -extern int mplSkinChanged; extern unsigned char * mplDrawBuffer; extern unsigned char * mplMenuDrawBuffer; diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index e766d0df21..bfcb107541 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -178,11 +178,10 @@ void ChangeSkin( void ) 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 ); @@ -193,6 +192,21 @@ void ChangeSkin( void ) 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 ); if ( ( mplDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.main.Bitmap.ImageSize ) ) == NULL ) |