[Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.c,1.1,1.2
Arpi of Ize
arpi at mplayer.dev.hu
Sun Aug 26 01:02:28 CEST 2001
Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv22119
Modified Files:
mplayer.c
Log Message:
commented, timer code disabled (see ws.c)
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mplayer.c 25 Aug 2001 21:04:28 -0000 1.1
+++ mplayer.c 25 Aug 2001 23:02:26 -0000 1.2
@@ -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 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 @@
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();
}
More information about the MPlayer-cvslog
mailing list