[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.49,1.50 mplayer.c,1.132,1.133 mplayer.h,1.1,1.2

[Megyer Laszlo]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv21152

Modified Files:
	cfg-mplayer.h mplayer.c mplayer.h 
Log Message:
when using -ss:
"seek seconds" -> "super seek"
now it understands 1:22:41.4   2:13   style time


Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** cfg-mplayer.h	2001/05/31 22:32:58	1.49
--- cfg-mplayer.h	2001/06/01 22:48:50	1.50
***************
*** 72,76 ****
  	{"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0},
  	{"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0},
! 	{"ss", &seek_to_sec, CONF_TYPE_INT, CONF_MIN, 0, 0},
  	{"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1},
  	{"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0},
--- 72,76 ----
  	{"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0},
  	{"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0},
! 	{"ss", &seek_to_sec, CONF_TYPE_STRING, CONF_MIN, 0, 0},
  	{"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1},
  	{"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0},

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -r1.132 -r1.133
*** mplayer.c	2001/06/01 20:13:48	1.132
--- mplayer.c	2001/06/01 22:48:50	1.133
***************
*** 446,450 ****
  char* filename=NULL; //"MI2-Trailer.avi";
  int i;
! int seek_to_sec=0;
  int seek_to_byte=0;
  int f; // filedes
--- 446,450 ----
  char* filename=NULL; //"MI2-Trailer.avi";
  int i;
! char *seek_to_sec=NULL;
  int seek_to_byte=0;
  int f; // filedes
***************
*** 514,518 ****
  int osd_last_pts=-303;
  
! int rel_seek_secs=0;
  
  #include "mixer.h"
--- 514,518 ----
  int osd_last_pts=-303;
  
! float rel_seek_secs=0;
  
  #include "mixer.h"
***************
*** 2156,2162 ****
    }
    if (seek_to_sec) {
!      rel_seek_secs += seek_to_sec;
!      seek_to_sec = 0;
    }
    if(rel_seek_secs)
    if(file_format==DEMUXER_TYPE_AVI && demuxer->idx_size<=0){
--- 2156,2171 ----
    }
    if (seek_to_sec) {
!     int a,b; float d;
!     
!     if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3)
! 	rel_seek_secs += 3600*a +60*b +d ;
!     else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2)
! 	rel_seek_secs += 60*a +d;
!     else if (sscanf(seek_to_sec, "%f", &d)==1)
! 	rel_seek_secs += d;
! 
!      seek_to_sec = NULL;
    }
+   
    if(rel_seek_secs)
    if(file_format==DEMUXER_TYPE_AVI && demuxer->idx_size<=0){

Index: mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mplayer.h	2001/05/08 12:59:03	1.1
--- mplayer.h	2001/06/01 22:48:50	1.2
***************
*** 7,11 ****
  extern char* filename;
  extern int i;
! extern int seek_to_sec;
  extern int seek_to_byte;
  extern int f; // filedes
--- 7,11 ----
  extern char* filename;
  extern int i;
! extern char *seek_to_sec;
  extern int seek_to_byte;
  extern int f; // filedes
***************
*** 71,75 ****
  extern int nogui;
  
! extern int rel_seek_secs;
  
  extern int osd_visible;
--- 71,75 ----
  extern int nogui;
  
! extern float rel_seek_secs;
  
  extern int osd_visible;


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog