[MPlayer-dev-eng] fix braindamaged -edlout behavior

[Reynaldo H. Verdejo Pinochet]

On Wed, Jul 05, 2006 at 04:24:21AM -0400, Reynaldo H. Verdejo Pinochet wrote:
> On Wed, Jul 05, 2006 at 04:05:14AM -0400, Reynaldo H. Verdejo Pinochet wrote:
> > Second try.
> > 
> > 	Reynaldo
> 
> I sent the wrong patch, here it is, ok to commit ?
> 
> 	Reynaldo

Damn ... wrong again, I should get some sleep :/, sorry for all
the hassle, here is the hoppefully last one of this flood
nightmare.

	Reynaldo
-------------- next part --------------
Index: DOCS/man/en/mplayer.1
===================================================================
--- DOCS/man/en/mplayer.1	(revision 18884)
+++ DOCS/man/en/mplayer.1	(working copy)
@@ -304,7 +304,7 @@
 .IPs "r and t"
 Move subtitles up/down.
 .IPs "i (\-edlout mode only)"
-Set EDL mark.
+Set start or end of an EDL skip and write it out to the given file.
 .IPs "s (\-vf screenshot only)"
 Take a screenshot.
 .IPs "I"
@@ -727,9 +727,8 @@
 .
 .TP
 .B \-edlout <filename>
-Creates a new file and writes edit decision list (EDL) records to that file.
-During playback, when the user hits 'i', an entry to skip over the last two
-seconds of playback will be written to the file.
+Creates a new file and writes edit decision list (EDL) records to it.
+During playback, the user hits 'i' to mark the start or end of a skip block
 This provides a starting point from which the user can fine-tune EDL entries
 later.
 See DOCS/\:HTML/\:en/\:edl.html for details.
Index: mplayer.c
===================================================================
--- mplayer.c	(revision 18893)
+++ mplayer.c	(working copy)
@@ -397,6 +397,7 @@
 short edl_muted  = 0; ///< Stores whether EDL is currently in muted mode.
 short edl_decision = 0; ///< 1 when an EDL operation has been made.
 FILE* edl_fd = NULL; ///< fd to write to when in -edlout mode.
+float begin_skip = MP_NOPTS_VALUE; ///< start time of the current skip while on edlout mode
 
 static unsigned int inited_flags=0;
 #define INITED_VO 1
@@ -4219,7 +4220,21 @@
       if( edl_fd ) {
 	float v = sh_video ? sh_video->pts :
 	    playing_audio_pts(sh_audio, d_audio, audio_out);
-	fprintf( edl_fd, "%f %f %d\n", v-2, v, 0 );
+
+	if(begin_skip == MP_NOPTS_VALUE)
+	{
+	  begin_skip = v; 
+	  mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_EdloutStartSkip);
+	}else{
+	  if(begin_skip > v)
+	  {
+	    mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdloutBadStop);
+	  }else{
+	    fprintf(edl_fd, "%f %f %d\n", begin_skip, v, 0);
+	    mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_EdloutEndSkip);
+	  }
+	  begin_skip = MP_NOPTS_VALUE;
+	}
       }
       break;
     case MP_CMD_SWITCH_RATIO : {
Index: help/help_mp-en.h
===================================================================
--- help/help_mp-en.h	(revision 18884)
+++ help/help_mp-en.h	(working copy)
@@ -198,6 +198,9 @@
 #define MSGTR_EdlBadLineOverlap "Last stop position was [%f]; next start is [%f].\n"\
 "Entries must be in chronological order, cannot overlap. Discarding.\n"
 #define MSGTR_EdlBadLineBadStop "Stop time has to be after start time.\n"
+#define MSGTR_EdloutBadStop "EDL skip canceled, last start > stop\n"
+#define MSGTR_EdloutStartSkip "EDL skip start, press 'i' again to end block.\n"
+#define MSGTR_EdloutEndSkip "EDL skip end, line written.\n"
 
 // mplayer.c OSD
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20060705/558d1eb3/attachment.pgp>