From 2a8b8d1d43787e9538b85d586d0ed7c617c030e7 Mon Sep 17 00:00:00 2001 From: pontscho Date: Sat, 2 Nov 2002 20:10:18 +0000 Subject: cosmetic git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8059 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/mplayer/menu.c | 13 +++++- Gui/mplayer/mplayer.c | 108 -------------------------------------------------- Gui/mplayer/mplayer.h | 14 +++++++ Gui/mplayer/mw.c | 5 +-- Gui/mplayer/sw.c | 6 +-- 5 files changed, 28 insertions(+), 118 deletions(-) delete mode 100644 Gui/mplayer/mplayer.c (limited to 'Gui/mplayer') diff --git a/Gui/mplayer/menu.c b/Gui/mplayer/menu.c index c83d247468..31cf947963 100644 --- a/Gui/mplayer/menu.c +++ b/Gui/mplayer/menu.c @@ -1,4 +1,15 @@ +#include +#include +#include + +#include "../app.h" +#include "../../config.h" +#include "../../help_mp.h" +#include "../../mp_msg.h" + +#include "widgets.h" + unsigned char * mplMenuDrawBuffer = NULL; int mplMenuRender = 1; int mplMenuItem = -1; @@ -7,7 +18,7 @@ int mplMenuX,mplMenuY; void mplHideMenu( int mx,int my,int w ); -void mplMenuDraw( wsParamDisplay ) +void mplMenuDraw( void ) { uint32_t * buf = NULL; uint32_t * drw = NULL; diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c deleted file mode 100644 index 6001710e5b..0000000000 --- a/Gui/mplayer/mplayer.c +++ /dev/null @@ -1,108 +0,0 @@ - -#include - -#include "../app.h" -#include "../skin/skin.h" -#include "../wm/ws.h" -#include "../wm/wsxdnd.h" - -#include "../../config.h" -#include "../../help_mp.h" -#include "../../libvo/x11_common.h" - -void mplEventHandling( int msg,float param ); - -extern void mplMainDraw( wsParamDisplay ); -extern void mplEventHandling( int msg,float param ); -extern void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY ); -extern void mplMainKeyHandle( int KeyCode,int Type,int Key ); -extern void mplDandDHandler(int num,char** files); -extern void mplSubDraw( wsParamDisplay ); -extern void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY ); - -#include "widgets.h" -#include "play.h" -#include "menu.h" - -void mplInit( void * disp ) -{ - int i; - - if ( ( mplDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.main.Bitmap.ImageSize ) ) == NULL ) - { - fprintf( stderr,MSGTR_NEMDB ); - exit( 0 ); - } - - wsCreateWindow( &appMPlayer.subWindow, - appMPlayer.sub.x,appMPlayer.sub.y,appMPlayer.sub.width,appMPlayer.sub.height, - wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsShowFrame|wsHideWindow,"ViDEO" ); - - wsDestroyImage( &appMPlayer.subWindow ); - wsCreateImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height ); - wsXDNDMakeAwareness(&appMPlayer.subWindow); - - vo_setwindow( appMPlayer.subWindow.WindowID, appMPlayer.subWindow.wGC ); - -// i=wsHideFrame|wsMaxSize|wsHideWindow; -// if ( appMPlayer.mainDecoration ) i=wsShowFrame|wsMaxSize|wsHideWindow; - i=wsShowFrame|wsMaxSize|wsHideWindow; - wsCreateWindow( &appMPlayer.mainWindow, - appMPlayer.main.x,appMPlayer.main.y,appMPlayer.main.width,appMPlayer.main.height, - wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,i,"MPlayer" ); //wsMinSize| - - wsSetShape( &appMPlayer.mainWindow,appMPlayer.main.Mask.Image ); - wsXDNDMakeAwareness(&appMPlayer.mainWindow); - - mplMenuInit(); - - #ifdef DEBUG - mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] Depth on screen: %d\n",wsDepthOnScreen ); - mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] parent: 0x%x\n",(int)appMPlayer.mainWindow.WindowID ); - mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] sub: 0x%x\n",(int)appMPlayer.subWindow.WindowID ); - #endif - - appMPlayer.mainWindow.ReDraw=mplMainDraw; - appMPlayer.mainWindow.MouseHandler=mplMainMouseHandle; - appMPlayer.mainWindow.KeyHandler=mplMainKeyHandle; - appMPlayer.mainWindow.DandDHandler=mplDandDHandler; - - appMPlayer.subWindow.ReDraw=mplSubDraw; - appMPlayer.subWindow.MouseHandler=mplSubMouseHandle; - appMPlayer.subWindow.KeyHandler=mplMainKeyHandle; - appMPlayer.subWindow.DandDHandler=mplDandDHandler; - - wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); - wsClearWindow( appMPlayer.subWindow ); - if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize ); - - btnModify( evSetVolume,guiIntfStruct.Volume ); - btnModify( evSetBalance,guiIntfStruct.Balance ); - btnModify( evSetMoviePosition,guiIntfStruct.Position ); - - wsSetIcon( wsDisplay,appMPlayer.mainWindow.WindowID,guiIcon,guiIconMask ); - wsSetIcon( wsDisplay,appMPlayer.subWindow.WindowID,guiIcon,guiIconMask ); - - guiIntfStruct.Playing=0; - - if ( !appMPlayer.mainDecoration ) wsWindowDecoration( &appMPlayer.mainWindow,0 ); - - wsVisibleWindow( &appMPlayer.mainWindow,wsShowWindow ); -#if 1 - wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow ); - - { - XEvent xev; - do { XNextEvent( wsDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != appMPlayer.subWindow.WindowID ); - appMPlayer.subWindow.Mapped=wsMapped; - } - - if ( fullscreen ) - { - mplFullScreen(); - btnModify( evFullScreen,btnPressed ); - } -#endif - mplSubRender=1; -} - diff --git a/Gui/mplayer/mplayer.h b/Gui/mplayer/mplayer.h index 662eacb334..99183ad7e1 100644 --- a/Gui/mplayer/mplayer.h +++ b/Gui/mplayer/mplayer.h @@ -15,4 +15,18 @@ extern int mplMiddleMenu; extern void mplInit( void * disp ); extern void mplEventHandling( int msg,float param ); +extern void mplMainDraw( void ); +extern void mplEventHandling( int msg,float param ); +extern void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY ); +extern void mplMainKeyHandle( int KeyCode,int Type,int Key ); +extern void mplDandDHandler(int num,char** files); + +extern void mplSubDraw( void ); +extern void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY ); + +extern void mplMenuInit( void ); +extern void mplHideMenu( int mx,int my,int w ); +extern void mplShowMenu( int mx,int my ); +extern void mplMenuMouseHandle( int X,int Y,int RX,int RY ); + #endif diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c index aff15a8397..a265bea5c3 100644 --- a/Gui/mplayer/mw.c +++ b/Gui/mplayer/mw.c @@ -24,9 +24,6 @@ #include "widgets.h" extern unsigned int GetTimerMS( void ); -extern void mplHideMenu( int mx,int my,int w ); -extern void mplShowMenu( int mx,int my ); -extern void mplMenuMouseHandle( int X,int Y,int RX,int RY ); unsigned char * mplDrawBuffer = NULL; int mplMainRender = 1; @@ -177,7 +174,7 @@ inline void PutImage( txSample * bf,int x,int y,int max,int ofs ) } } -void mplMainDraw( wsParamDisplay ) +void mplMainDraw( void ) { wItem * item; txSample * image = NULL; diff --git a/Gui/mplayer/sw.c b/Gui/mplayer/sw.c index 2593fede4d..ac0f9b8901 100644 --- a/Gui/mplayer/sw.c +++ b/Gui/mplayer/sw.c @@ -13,11 +13,7 @@ extern int boxMoved; extern int sx,sy; extern int i,pot; -extern void mplHideMenu( int mx,int my,int w ); -extern void mplShowMenu( int mx,int my ); -extern void mplMenuMouseHandle( int X,int Y,int RX,int RY ); - -void mplSubDraw( wsParamDisplay ) +void mplSubDraw( void ) { if ( appMPlayer.subWindow.State == wsWindowClosed ) exit_player( MSGTR_Exit_quit ); -- cgit v1.2.3