[MPlayer-DOCS] r32524 - in trunk: DOCS/man/en/mplayer.1 DOCS/tech/slave.txt cfg-mplayer.h command.c help/help_mp-en.h help/help_mp-hu.h help/help_mp-it.h input/input.c input/input.h mplayer.c mplayer.h stream/cac...

[diego]

Author: diego
Date: Thu Oct 21 20:19:30 2010
New Revision: 32524

Log:
Implement a basic capture feature, available through -capture.
If a specified key is pressed during playback, the current stream is
captured to a file, similar to what -dumpstream achieves.
patch by Pásztor Szilárd, don tricon hu

Modified:
   trunk/DOCS/man/en/mplayer.1
   trunk/help/help_mp-en.h

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/tech/slave.txt
   trunk/cfg-mplayer.h
   trunk/command.c
   trunk/help/help_mp-hu.h
   trunk/help/help_mp-it.h
   trunk/input/input.c
   trunk/input/input.h
   trunk/mplayer.c
   trunk/mplayer.h
   trunk/stream/cache2.c
   trunk/stream/stream.c
   trunk/stream/stream.h

Modified: trunk/DOCS/man/en/mplayer.1
==============================================================================
--- trunk/DOCS/man/en/mplayer.1	Thu Oct 21 19:35:56 2010	(r32523)
+++ trunk/DOCS/man/en/mplayer.1	Thu Oct 21 20:19:30 2010	(r32524)
@@ -281,6 +281,8 @@ Toggle displaying "forced subtitles".
 Toggle subtitle alignment: top / middle / bottom.
 .IPs "x and z"
 Adjust subtitle delay by +/\- 0.1 seconds.
+.IPs "c (\-capture only)"
+Start/stop capturing the primary stream.
 .IPs "r and t"
 Move subtitles up/down.
 .IPs "i (\-edlout mode only)"
@@ -1340,6 +1342,18 @@ from the current position, MPlayer will 
 this position rather than performing a stream seek (default: 50).
 .
 .TP
+.B \-capture (MPlayer only)
+Allows capturing the primary stream (not additional audio tracks or other
+kind of streams) into the file specified by \-dumpfile or \"stream.dump\"
+by default.
+If this option is given, capturing can be started and stopped by pressing
+the key bound to this function (see section INTERACTIVE CONTROL).
+Same as for \-dumpstream, this will likely not produce usable results for
+anything else than MPEG streams.
+Note that, due to cache latencies, captured data may begin and end
+somewhat delayed compared to what you see displayed.
+.
+.TP
 .B \-cdda <option1:option2> (CDDA only)
 This option can be used to tune the CD Audio reading feature of MPlayer.
 .sp 1
@@ -1465,7 +1479,8 @@ on the command line only the last one wi
 .TP
 .B \-dumpfile <filename> (MPlayer only)
 Specify which file MPlayer should dump to.
-Should be used together with \-dumpaudio / \-dumpvideo / \-dumpstream.
+Should be used together with \-dumpaudio / \-dumpvideo / \-dumpstream /
+\-capture.
 .
 .TP
 .B \-dumpstream (MPlayer only)

Modified: trunk/help/help_mp-en.h
==============================================================================
--- trunk/help/help_mp-en.h	Thu Oct 21 19:35:56 2010	(r32523)
+++ trunk/help/help_mp-en.h	Thu Oct 21 20:19:30 2010	(r32524)
@@ -213,6 +213,8 @@ static const char help_text[]=
 #define MSGTR_OSDChapter "Chapter: (%d) %s"
 #define MSGTR_OSDAngle "Angle: %d/%d"
 #define MSGTR_OSDDeinterlace "Deinterlace: %s"
+#define MSGTR_OSDCapturing "Capturing: %s"
+#define MSGTR_OSDCapturingFailure "Capturing failed"
 
 // property values
 #define MSGTR_Enabled "enabled"