[Mplayer-cvslog] CVS: main/Gui/mplayer play.c,1.3,1.4 play.h,1.1,1.2
Zoltan Ponekker
pontscho at mplayer.dev.hu
Wed Aug 29 17:07:42 CEST 2001
Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv29918/Gui/mplayer
Modified Files:
play.c play.h
Log Message:
fix playing
Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- play.c 28 Aug 2001 15:54:04 -0000 1.3
+++ play.c 29 Aug 2001 15:07:39 -0000 1.4
@@ -7,8 +7,6 @@
int mplParent = 1;
-float gui_position=-1;
-
int mplx,mply,mplwidth,mplheight;
#include "../app.h"
@@ -106,7 +104,7 @@
mplShMem=calloc( 1,ShMemSize );
#endif
signal( SIGTYPE,mplMainSigHandler );
- signal( SIGCHLD,SIG_IGN );
+// signal( SIGCHLD,SIG_IGN );
mplShMem->Playing=0;
mplShMem->Volume=0.0f;
@@ -124,14 +122,13 @@
float mplGetPosition( void )
{ // return 0.0 ... 100.0
-// return (gui_position<0)?(mplShMem->Position):(gui_position*100.0);
return mplShMem->Position;
}
void mplRelSeek( float s )
{ // -+s
// ---
-printf("%%%%%% RelSEEK=%5.3f \n",s);
+//printf("%%%%%% RelSEEK=%5.3f \n",s);
// ---
rel_seek_secs=s; abs_seek_pos=0;
}
@@ -139,7 +136,7 @@
void mplAbsSeek( float s )
{ // 0.0 ... 100.0
// ---
-printf("%%%%%% AbsSEEK=%5.3f \n",s);
+//printf("%%%%%% AbsSEEK=%5.3f \n",s);
rel_seek_secs=0.01*s; abs_seek_pos=3;
// ---
}
Index: play.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- play.h 25 Aug 2001 21:04:28 -0000 1.1
+++ play.h 29 Aug 2001 15:07:39 -0000 1.2
@@ -43,6 +43,7 @@
int StreamType;
int TimeSec;
int LengthInSec;
+ char Filename[4096];
} mplCommStruct;
extern mplCommStruct * mplShMem;
More information about the MPlayer-cvslog
mailing list