Mercurial > mplayer.hg

changeset 22338:434cd072b0d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Seek to -ss position without first starting audio/video from the start. Manual seeks no longer shift -endpos position (hopefully no one considered that a "feature").
author uau
date Tue, 27 Feb 2007 01:16:59 +0000
parents d79bd226342d
children 2387057d3e14
files mplayer.c
diffstat 1 files changed, 11 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Tue Feb 27 00:19:01 2007 +0000
+++ b/mplayer.c	Tue Feb 27 01:16:59 2007 +0000
@@ -3330,6 +3330,17 @@
   mpctx->eof=PT_NEXT_ENTRY; goto goto_next_file;
 }
 
+if (seek_to_sec) {
+    seek(mpctx, seek_to_sec, 1);
+    end_at.pos += seek_to_sec;
+}
+
+if (end_at.type == END_AT_SIZE) {
+    mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_MPEndposNoSizeBased);
+    end_at.type = END_AT_NONE;
+}
+
+
 while(!mpctx->eof){
     float aq_sleep_time=0;
 if(!mpctx->sh_audio && mpctx->d_audio->sh) {
@@ -3506,20 +3517,6 @@
 }
   mpctx->was_paused = 0;
 
-  if (seek_to_sec) {
-      rel_seek_secs += seek_to_sec;
-      seek_to_sec = 0;
-  }
-  
-  if (end_at.type != END_AT_NONE) {
-    if(end_at.type == END_AT_SIZE) {
-      mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_MPEndposNoSizeBased);
-      end_at.type = END_AT_NONE;
-    } else {
-      end_at.pos += rel_seek_secs;
-    }
-  }
-
   /* Looping. */
   if(mpctx->eof==1 && loop_times>=0) {
     int l = loop_times;