summaryrefslogtreecommitdiffstats
path: root/Gui/mplayer/play.c
diff options
context:
space:
mode:
Diffstat (limited to 'Gui/mplayer/play.c')
-rw-r--r--Gui/mplayer/play.c14
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 )