[Mplayer-cvslog] CVS: main mplayer.c,1.100,1.101 cfg-mplayer.h,1.37,1.38

[GEREOFFY]

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

Modified Files:
	mplayer.c cfg-mplayer.h 
Log Message:
-ss patch by Loring Holden

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -r1.100 -r1.101
*** mplayer.c	2001/04/26 20:41:26	1.100
--- mplayer.c	2001/04/26 22:10:01	1.101
***************
*** 1669,1672 ****
--- 1669,1677 ----
        osd_function=OSD_REW;
        rel_seek_secs-=60;break;
+     // seek 10 min
+     case KEY_PAGE_UP:
+       rel_seek_secs+=600;break;
+     case KEY_PAGE_DOWN:
+       rel_seek_secs-=600;break;
      // delay correction:
      case '+':
***************
*** 1715,1718 ****
--- 1720,1727 ----
        mixer_usemaster=!mixer_usemaster;
        break;
+   }
+   if (seek_to_sec) {
+      rel_seek_secs += seek_to_sec;
+      seek_to_sec = 0;
    }
    if(rel_seek_secs)

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** cfg-mplayer.h	2001/04/26 15:50:45	1.37
--- cfg-mplayer.h	2001/04/26 22:10:01	1.38
***************
*** 59,63 ****
  	{"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},
--- 59,63 ----
  	{"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},


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