RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-18 05:07:18 +00:00
Code Issues Releases Wiki Activity

skin chaning bug fix.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2227 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pontscho 2001-10-16 21:23:59 +00:00
parent 833b109e49
commit d5ce7add8a
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gui/mplayer/mplayer.c
View File

@ -27,8 +27,6 @@ int mplRedrawTimer = mplRedrawTimerConst;
int mplGeneralTimer = -1; int mplGeneralTimer = -1;
int mplTimer = 0; int mplTimer = 0;
int mplSkinChanged = 0;
void mplMsgHandle( int msg,float param ); void mplMsgHandle( int msg,float param );
#include "widgets.h" #include "widgets.h"

1
Gui/mplayer/mplayer.h
View File

@ -5,7 +5,6 @@
extern int mplSubRender; extern int mplSubRender;
extern int mplMainRender; extern int mplMainRender;
extern int mplGeneralTimer; extern int mplGeneralTimer;
extern int mplSkinChanged;
extern unsigned char * mplDrawBuffer; extern unsigned char * mplDrawBuffer;
extern unsigned char * mplMenuDrawBuffer; extern unsigned char * mplMenuDrawBuffer;

18
Gui/mplayer/play.c
View File

@ -178,11 +178,10 @@ void ChangeSkin( void )
wsResizeImage( &appMPlayer.menuWindow,appMPlayer.menuBase.width,appMPlayer.menuBase.height ); 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 ( appMPlayer.sub.Bitmap.Image ) wsResizeImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height );
if ( !mplShMem->Playing ) if ( !mplShMem->Playing )
{ {
mplSkinChanged=0;
if ( !appMPlayer.subWindow.isFullScreen ) if ( !appMPlayer.subWindow.isFullScreen )
{ {
wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height ); 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 ); if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );
mplSubRender=1; wsPostRedisplay( &appMPlayer.subWindow ); 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 ) free( mplDrawBuffer );
if ( ( mplDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.main.Bitmap.ImageSize ) ) == NULL ) if ( ( mplDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.main.Bitmap.ImageSize ) ) == NULL )