diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-25 23:02:26 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-25 23:02:26 +0000 |
commit | d499079a6af0d8855bda8cd348de31139598b890 (patch) | |
tree | 5b9fcc07fe619528cc067289f8d77e6fa3ca8d57 /Gui/mplayer | |
parent | 311cd09ea2300d051d3aabe85acdddedc87bcc36 (diff) | |
download | mpv-d499079a6af0d8855bda8cd348de31139598b890.tar.bz2 mpv-d499079a6af0d8855bda8cd348de31139598b890.tar.xz |
commented, timer code disabled (see ws.c)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1698 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer')
-rw-r--r-- | Gui/mplayer/mplayer.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c index 6e8cc979ef..66bff1f521 100644 --- a/Gui/mplayer/mplayer.c +++ b/Gui/mplayer/mplayer.c @@ -18,8 +18,8 @@ #include "../../config.h" -#define mplMouseTimerConst 100 -#define mplRedrawTimerConst 50 +#define mplMouseTimerConst 10 +#define mplRedrawTimerConst 5 int mplMouseTimer = mplMouseTimerConst; int mplRedrawTimer = mplRedrawTimerConst; @@ -51,11 +51,18 @@ void mplTimerHandler( int signum ) void mplInit( int argc,char* argv[], char *envp[] ) { // parse_cfgfiles( argc,argv,envp ); + + // allocates shmem to gtkShMem + // fork() a process which runs gtkThreadProc() [gtkChildPID] gtkInit( argc,argv,envp ); + + // allocates shmem to mplShMem + // init fields of this struct to default values mplMPlayerInit( argc,argv,envp ); - message=mplErrorHandler; + message=mplErrorHandler; // error messagebox drawing function + // opens X display, checks for extensions (XShape, DGA etc) wsXInit(); if ( ( mplDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.main.Bitmap.ImageSize ) ) == NULL ) @@ -98,15 +105,15 @@ void mplInit( int argc,char* argv[], char *envp[] ) btnModify( evSetBalance,mplShMem->Balance ); btnModify( evSetMoviePosition,mplShMem->Position ); - timerSetHandler( mplTimerHandler ); - timerInit(); +// timerSetHandler( mplTimerHandler ); // various timer hacks +// timerInit(); - wsMainLoop(); + wsMainLoop(); // X event handler (calls mplTimerHandler periodically!) dbprintf( 1,"[mplayer] exit.\n" ); mplStop(); - timerDone(); - gtkDone(); +// timerDone(); + gtkDone(); // kills the gtkThreadProc() process wsXDone(); } |