Mercurial > mplayer.hg
diff gui/mplayer/pb.c @ 29263:0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
author | diego |
---|---|
date | Wed, 13 May 2009 02:58:57 +0000 |
parents | 9e739bdb049c |
children | 016e5fc1dead |
line wrap: on
line diff
--- a/gui/mplayer/pb.c Tue May 12 19:25:35 2009 +0000 +++ b/gui/mplayer/pb.c Wed May 13 02:58:57 2009 +0000 @@ -59,7 +59,7 @@ void mplPBDraw( void ) { int x; - + if ( !appMPlayer.subWindow.isFullScreen ) return; if ( !mplPBVisible || !appMPlayer.barIsPresent ) return; @@ -70,7 +70,7 @@ case -2: x=( appMPlayer.subWindow.Width - appMPlayer.bar.width ); break; default: x=appMPlayer.bar.x; } - + switch ( mplPBFade ) { case 1: // fade in @@ -81,7 +81,7 @@ mplPBFade=0; vo_mouse_autohide=0; } - wsMoveWindow( &appMPlayer.barWindow,0,x,mplPBLength ); + wsMoveWindow( &appMPlayer.barWindow,0,x,mplPBLength ); break; case 2: // fade out mplPBLength+=10; @@ -89,11 +89,11 @@ { mplPBLength=appMPlayer.subWindow.Height; mplPBFade=mplPBVisible=0; - vo_mouse_autohide=1; - wsVisibleWindow( &appMPlayer.barWindow,wsHideWindow ); + vo_mouse_autohide=1; + wsVisibleWindow( &appMPlayer.barWindow,wsHideWindow ); return; } - wsMoveWindow( &appMPlayer.barWindow,0,x,mplPBLength ); + wsMoveWindow( &appMPlayer.barWindow,0,x,mplPBLength ); break; } @@ -102,12 +102,12 @@ { btnModify( evSetMoviePosition,guiIntfStruct.Position ); btnModify( evSetVolume,guiIntfStruct.Volume ); - + vo_mouse_autohide=0; fast_memcpy( mplPBDrawBuffer,appMPlayer.bar.Bitmap.Image,appMPlayer.bar.Bitmap.ImageSize ); Render( &appMPlayer.barWindow,appMPlayer.barItems,appMPlayer.NumberOfBarItems,mplPBDrawBuffer,appMPlayer.bar.Bitmap.ImageSize ); - wsConvert( &appMPlayer.barWindow,mplPBDrawBuffer,appMPlayer.bar.Bitmap.ImageSize ); + wsConvert( &appMPlayer.barWindow,mplPBDrawBuffer,appMPlayer.bar.Bitmap.ImageSize ); } wsPutImage( &appMPlayer.barWindow ); } @@ -121,7 +121,7 @@ int i; wItem * item = NULL; float value = 0.0f; - + static int SelectedItem = -1; int currentselected = -1; @@ -129,7 +129,7 @@ if ( ( appMPlayer.barItems[i].pressed != btnDisabled )&& ( wgIsRect( X,Y,appMPlayer.barItems[i].x,appMPlayer.barItems[i].y,appMPlayer.barItems[i].x+appMPlayer.barItems[i].width,appMPlayer.barItems[i].y+appMPlayer.barItems[i].height ) ) ) { currentselected=i; break; } - + switch ( Button ) { case wsPMMouseButton: @@ -230,8 +230,8 @@ if ( !appMPlayer.barIsPresent || !gtkEnablePlayBar ) return; if ( !appMPlayer.subWindow.isFullScreen ) return; - if ( y > appMPlayer.subWindow.Height - appMPlayer.bar.height ) - { + if ( y > appMPlayer.subWindow.Height - appMPlayer.bar.height ) + { if ( !mplPBFade ) wsVisibleWindow( &appMPlayer.barWindow,wsShowWindow ); mplPBFade=1; mplPBVisible=1; wsPostRedisplay( &appMPlayer.barWindow ); } @@ -256,10 +256,10 @@ wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsHideFrame|wsHideWindow,"PlayBar" ); wsSetShape( &appMPlayer.barWindow,appMPlayer.bar.Mask.Image ); - + appMPlayer.barWindow.ReDraw=(void *)mplPBDraw; appMPlayer.barWindow.MouseHandler=mplPBMouseHandle; appMPlayer.barWindow.KeyHandler=mplMainKeyHandle; - + mplPBLength=appMPlayer.subWindow.Height; }