diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-31 22:07:53 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-31 22:07:53 +0000 |
commit | abca9bccc2256dfd44bacf7ba722c69638ae56aa (patch) | |
tree | 4c1c046ecf3233eb9e0d2fa4ee6ad347273ae576 /Gui | |
parent | 454fe03492d1ef96d8e9b34aeb0fbaac4d9a2d15 (diff) | |
download | mpv-abca9bccc2256dfd44bacf7ba722c69638ae56aa.tar.bz2 mpv-abca9bccc2256dfd44bacf7ba722c69638ae56aa.tar.xz |
fix resize
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1816 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r-- | Gui/mplayer/play.c | 20 | ||||
-rw-r--r-- | Gui/mplayer/psignal.c | 5 | ||||
-rw-r--r-- | Gui/mplayer/sw.h | 9 |
3 files changed, 9 insertions, 25 deletions
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index 0730ef825d..d5c3c62766 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -48,9 +48,6 @@ extern int mplSubRender; void mplStop() { if ( !mplShMem->Playing ) return; -// --- -printf("%%%%%% STOP \n"); -// --- mplShMem->Playing=0; mplShMem->TimeSec=0; if ( !appMPlayer.subWindow.isFullScreen ) @@ -67,34 +64,27 @@ void mplPlay( void ) if ( ( mplShMem->Filename[0] == 0 )|| ( mplShMem->Playing == 1 ) ) return; if ( mplShMem->Playing == 2 ) { mplPause(); return; } -// --- -//printf("%%%%%% PLAY \n"); -// --- mplShMem->Playing=1; -// wsPostRedisplay( &appMPlayer.subWindow ); + wsClearWindow( appMPlayer.subWindow ); mplSubRender=0; } void mplPause( void ) { -// --- -//printf("%%%%%% PAUSE \n"); -// --- switch( mplShMem->Playing ) { case 1: // playing mplShMem->Playing=2; btnModify( evPlaySwitchToPause,btnReleased ); btnModify( evPauseSwitchToPlay,btnDisabled ); - mplSubRender=0; break; case 2: // paused mplShMem->Playing=1; btnModify( evPlaySwitchToPause,btnDisabled ); btnModify( evPauseSwitchToPlay,btnReleased ); - mplSubRender=0; break; } + mplSubRender=0; } void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height ) @@ -124,18 +114,12 @@ float mplGetPosition( void ) void mplRelSeek( float s ) { // -+s -// --- -//printf("%%%%%% RelSEEK=%5.3f \n",s); -// --- rel_seek_secs=s; abs_seek_pos=0; } void mplAbsSeek( float s ) { // 0.0 ... 100.0 -// --- -//printf("%%%%%% AbsSEEK=%5.3f \n",s); rel_seek_secs=0.01*s; abs_seek_pos=3; -// --- } listItems tmpList; diff --git a/Gui/mplayer/psignal.c b/Gui/mplayer/psignal.c index b005e358b6..19c97c7f64 100644 --- a/Gui/mplayer/psignal.c +++ b/Gui/mplayer/psignal.c @@ -156,7 +156,10 @@ void mplMainSigHandler( int s ) break; case evSkinBrowser: mplShMem->SkinChange=1; break; case evFileLoaded: - strcpy( mplShMem->Filename,gtkShMem->fs.dir ); strcat( mplShMem->Filename,"/" ); strcat( mplShMem->Filename,gtkShMem->fs.filename ); + strcpy( mplShMem->Filename,gtkShMem->fs.dir ); + strcat( mplShMem->Filename,"/" ); + strcat( mplShMem->Filename,gtkShMem->fs.filename ); + printf( "%%%%%%%% Playing file: %s\n",mplShMem->Filename ); mplShMem->FilenameChanged=1; if ( mplMainAutoPlay ) mplGeneralTimer=1; break; diff --git a/Gui/mplayer/sw.h b/Gui/mplayer/sw.h index ed39c0e1de..bd8f9e9caa 100644 --- a/Gui/mplayer/sw.h +++ b/Gui/mplayer/sw.h @@ -50,18 +50,15 @@ void mplSubDraw( wsParamDisplay ) if ( ( mplShMem->Playing ) )//&&( appMPlayer.subWindow.State == wsWindowExpose ) ) { -printf( "------> redraw volib.\n" ); - wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 ); - wsClearWindow( appMPlayer.subWindow ); vo_expose=1; mplSubRender=0; } if ( mplSubRender ) { -printf( "------> redraw video.\n" ); - wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); - wsClearWindow( appMPlayer.subWindow ); + wsSetForegroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); + XFillRectangle( wsDisplay,appMPlayer.subWindow.WindowID,appMPlayer.subWindow.wGC,0,0, + appMPlayer.subWindow.Width,appMPlayer.subWindow.Height ); if ( appMPlayer.sub.Bitmap.Image ) { wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize ); |