diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-29 15:07:40 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-29 15:07:40 +0000 |
commit | 4c954d99b694a93fa2ae248d665ae810615389d6 (patch) | |
tree | 4ce518d359ce8ab2989f07d1822306c498de785e | |
parent | 19c99b1f13305b3c27416a80cadee34a82dac662 (diff) |
fix playing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1744 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | Gui/events.h | 1 | ||||
-rw-r--r-- | Gui/mplayer/play.c | 9 | ||||
-rw-r--r-- | Gui/mplayer/play.h | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/Gui/events.h b/Gui/events.h index fb7e1c5cd6..893cb4ee5f 100644 --- a/Gui/events.h +++ b/Gui/events.h @@ -56,6 +56,7 @@ #define evRedraw 7002 #define evHideWindow 7003 #define evShowWindow 7004 +#define evFirstLoad 7005 // ---------------------- diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index 3334742d35..3cbfd63f4a 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -7,8 +7,6 @@ int mplParent = 1; -float gui_position=-1; - int mplx,mply,mplwidth,mplheight; #include "../app.h" @@ -106,7 +104,7 @@ void mplMPlayerInit( int argc,char* argv[], char *envp[] ) 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 @@ void mplMPlayerInit( int argc,char* argv[], char *envp[] ) 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 @@ printf("%%%%%% RelSEEK=%5.3f \n",s); 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; // --- } diff --git a/Gui/mplayer/play.h b/Gui/mplayer/play.h index 887a51d049..8fc0fbbf99 100644 --- a/Gui/mplayer/play.h +++ b/Gui/mplayer/play.h @@ -43,6 +43,7 @@ typedef struct int StreamType; int TimeSec; int LengthInSec; + char Filename[4096]; } mplCommStruct; extern mplCommStruct * mplShMem; |