Mercurial > mplayer.hg

changeset 1743:b266f763cad3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix playing
author pontscho
date Wed, 29 Aug 2001 15:07:40 +0000
parents 0880718750d5
children 688748ea8e68
files Gui/events.h Gui/mplayer/play.c Gui/mplayer/play.h
diffstat 3 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/events.h	Wed Aug 29 13:52:08 2001 +0000
+++ b/Gui/events.h	Wed Aug 29 15:07:40 2001 +0000
@@ -56,6 +56,7 @@
 #define evRedraw          7002
 #define evHideWindow      7003
 #define evShowWindow      7004
+#define evFirstLoad       7005
 
 // ----------------------
 
--- a/Gui/mplayer/play.c	Wed Aug 29 13:52:08 2001 +0000
+++ b/Gui/mplayer/play.c	Wed Aug 29 15:07:40 2001 +0000
@@ -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;
 // ---
 }
--- a/Gui/mplayer/play.h	Wed Aug 29 13:52:08 2001 +0000
+++ b/Gui/mplayer/play.h	Wed Aug 29 15:07:40 2001 +0000
@@ -43,6 +43,7 @@
    int    StreamType;
    int    TimeSec;
    int    LengthInSec;
+   char   Filename[4096];
 } mplCommStruct;
 
 extern mplCommStruct * mplShMem;