[Mplayer-cvslog] CVS: main/Gui/mplayer play.c,1.2,1.3

Zoltan Ponekker pontscho at mplayer.dev.hu
Tue Aug 28 17:54:06 CEST 2001


Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv25943/Gui/mplayer

Modified Files:
	play.c 
Log Message:
fix hprogressbar

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- play.c	27 Aug 2001 23:56:43 -0000	1.2
+++ play.c	28 Aug 2001 15:54:04 -0000	1.3
@@ -7,10 +7,10 @@
 
 int    mplParent = 1;
 
-int    mplx,mply,mplwidth,mplheight;
-
 float gui_position=-1;
 
+int    mplx,mply,mplwidth,mplheight;
+
 #include "../app.h"
 
 #include "../wm/ws.h"
@@ -100,7 +100,11 @@
 
 void mplMPlayerInit( int argc,char* argv[], char *envp[] )
 {
+#if 0
  mplShMem=shmem_alloc( ShMemSize );
+#else
+ mplShMem=calloc( 1,ShMemSize );
+#endif
  signal( SIGTYPE,mplMainSigHandler );
  signal( SIGCHLD,SIG_IGN );
 
@@ -120,7 +124,8 @@
 
 float mplGetPosition( void )
 { // return 0.0 ... 100.0
- return (gui_position<0)?(mplShMem->Position):(gui_position*100.0);
+// return (gui_position<0)?(mplShMem->Position):(gui_position*100.0);
+ return mplShMem->Position;
 }
 
 void mplRelSeek( float s )
@@ -128,7 +133,6 @@
 // ---
 printf("%%%%%% RelSEEK=%5.3f  \n",s);
 // ---
- mplShMem->Position=mplGetPosition() + s;
  rel_seek_secs=s; abs_seek_pos=0;
 }
 
@@ -138,8 +142,6 @@
 printf("%%%%%% AbsSEEK=%5.3f  \n",s);
  rel_seek_secs=0.01*s; abs_seek_pos=3;
 // ---
- mplShMem->Position=s;
- mplShMem->TimeSec=s;
 }
 
 void mplIncAudioBufDelay( void )




More information about the MPlayer-cvslog mailing list