[MPlayer-cvslog] r31646 - in trunk: DOCS/man/en/mplayer.1 cfg-mplayer.h mplayer.c

[reynaldo]

Author: reynaldo
Date: Thu Jul  8 17:52:47 2010
New Revision: 31646

Log:
Implement edl-backward-delay to avoid jumping right over an
EDL skipped segment. Patch by Vlad Seryakov vseryakov AT Gmail.

Modified:
   trunk/cfg-mplayer.h
   trunk/mplayer.c

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/en/mplayer.1

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	Wed Jul  7 13:52:31 2010	(r31645)
+++ trunk/cfg-mplayer.h	Thu Jul  8 17:52:47 2010	(r31646)
@@ -102,6 +102,7 @@ const m_option_t mplayer_opts[]={
     {"noalsa", "-noalsa has been removed. Remove it from your config file.\n",
      CONF_TYPE_PRINT, 0, 0, 0, NULL},
     {"edlout", &edl_output_filename,  CONF_TYPE_STRING, 0, 0, 0, NULL},
+    {"edl-backward-delay", &edl_backward_delay,  CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
 
 #ifdef CONFIG_X11
     {"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0, NULL},

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Wed Jul  7 13:52:31 2010	(r31645)
+++ trunk/mplayer.c	Thu Jul  8 17:52:47 2010	(r31646)
@@ -336,7 +336,7 @@ FILE* edl_fd = NULL; ///< fd to write to
 // have some time after the seek to decide what to do next
 // (next seek, pause,...), otherwise after the seek it will
 // enter the same scene again and skip forward immediately
-float edl_backward_extra_sec = 2;
+float edl_backward_delay = 2;
 int use_filedir_conf;
 int use_filename_title;
 
@@ -2545,7 +2545,7 @@ static void edl_update(MPContext *mpctx)
                     abs_seek_pos = 0;
                     rel_seek_secs = -(mpctx->sh_video->pts -
                                       next_edl_record->start_sec +
-                                      edl_backward_extra_sec);
+                                      edl_backward_delay);
                     mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: pts [%f], "
                            "offset [%f], start [%f], stop [%f], length [%f]\n",
                            mpctx->sh_video->pts, rel_seek_secs,