diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-23 15:12:55 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-23 15:12:55 +0000 |
commit | c090d0da98cfc613b7b9b7227dd505735df224a6 (patch) | |
tree | 0e27f5b57f9efcde040f3b8381544468612f47d6 /Gui/interface.c | |
parent | 469f2d1b7e6c2251cbc9418b111f5bc700c7a262 (diff) | |
download | mpv-c090d0da98cfc613b7b9b7227dd505735df224a6.tar.bz2 mpv-c090d0da98cfc613b7b9b7227dd505735df224a6.tar.xz |
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4819 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/interface.c')
-rw-r--r-- | Gui/interface.c | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/Gui/interface.c b/Gui/interface.c index c4b1fba858..ff003d4064 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -1,9 +1,31 @@ +#include <string.h> #include "ws.h" #include "mplayer/play.h" #include "interface.h" + #include "../mplayer.h" +#include "mplayer/widgets.h" +#include "mplayer/mplayer.h" +#include "app.h" +#include "../libvo/x11_common.h" + +guiInterface_t guiIntfStruct; + +void guiInit( int argc,char* argv[], char *envp[] ) +{ + memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) ); + appInit( argc,argv,envp,(void*)mDisplay ); +} + +void guiDone( void ) +{ + mp_msg( MSGT_GPLAYER,MSGL_V,"[mplayer] exit.\n" ); + mplStop(); + gtkDone(); + wsXDone(); +} void guiGetEvent( int type,char * arg ) { @@ -11,15 +33,16 @@ void guiGetEvent( int type,char * arg ) { case guiXEvent: wsEvents( wsDisplay,(XEvent *)arg,NULL ); - break; + gtkEventHandling(); + break; case guiCEvent: - break; + break; } } void guiEventHandling( void ) { - if ( use_gui && !mplShMem->Playing ) wsHandleEvents(); - mplTimerHandler(0); // handle GUI timer events - if ( mplShMem->SkinChange ) { ChangeSkin(); mplShMem->SkinChange=0; } + if ( use_gui && !guiIntfStruct.Playing ) wsHandleEvents(); + gtkEventHandling(); + mplTimerHandler(); // handle GUI timer events } |