diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-28 15:55:02 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-28 15:55:02 +0000 |
commit | bce2755a134ecc39e5abac49e144f427e911d001 (patch) | |
tree | 3a59fd25f1b02a1903a309ed46c64be94ec00e12 /Gui/mplayer/play.c | |
parent | c5c913ad170d5c98ac4eb01a913a9ee0e2a25cda (diff) | |
download | mpv-bce2755a134ecc39e5abac49e144f427e911d001.tar.bz2 mpv-bce2755a134ecc39e5abac49e144f427e911d001.tar.xz |
fix hprogressbar
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1730 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer/play.c')
-rw-r--r-- | Gui/mplayer/play.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index 15724e2997..3334742d35 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -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 @@ printf("mplResize(%d,%d,%d,%d) \n",X,Y,width,height); 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 @@ 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 (gui_position<0)?(mplShMem->Position):(gui_position*100.0); + return mplShMem->Position; } void mplRelSeek( float s ) @@ -128,7 +133,6 @@ void mplRelSeek( float s ) // --- printf("%%%%%% RelSEEK=%5.3f \n",s); // --- - mplShMem->Position=mplGetPosition() + s; rel_seek_secs=s; abs_seek_pos=0; } @@ -138,8 +142,6 @@ void mplAbsSeek( float s ) 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 ) |