Mercurial > mplayer.hg

changeset 13626:741649fe31cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow to step only one frame forward by pressing s.
author reimar
date Tue, 12 Oct 2004 22:10:56 +0000
parents 305feac021c4
children 7a3f8587bcb7
files DOCS/man/en/mplayer.1 DOCS/tech/slave.txt etc/input.conf input/input.c input/input.h mplayer.c
diffstat 6 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1	Tue Oct 12 21:31:32 2004 +0000
+++ b/DOCS/man/en/mplayer.1	Tue Oct 12 22:10:56 2004 +0000
@@ -227,6 +227,10 @@
 next/\:previous alternative source (ASX playlist only)
 .IPs "p / SPACE"
 Pause movie (any key unpauses).
+.IPs "s"
+Step forward.
+Pressing once will pause movie, every consecutive press will play one frame
+and then go into pause mode again (any other key unpauses).
 .IPs "q / ESC"
 Stop playing and quit.
 .IPs "+ and -"
--- a/DOCS/tech/slave.txt	Tue Oct 12 21:31:32 2004 +0000
+++ b/DOCS/tech/slave.txt	Tue Oct 12 22:10:56 2004 +0000
@@ -28,6 +28,9 @@
 pause
     Pause/unpause the playback.
 
+frame_step
+    Play one frame, then pause again.
+
 grab_frames
     ???
 
--- a/etc/input.conf	Tue Oct 12 21:31:32 2004 +0000
+++ b/etc/input.conf	Tue Oct 12 22:10:56 2004 +0000
@@ -19,6 +19,7 @@
 ESC quit
 ENTER pt_step 1 1
 p pause
+s frame_step
 SPACE pause
 HOME pt_up_step 1
 END pt_up_step -1
--- a/input/input.c	Tue Oct 12 21:31:32 2004 +0000
+++ b/input/input.c	Tue Oct 12 22:10:56 2004 +0000
@@ -57,6 +57,7 @@
   { MP_CMD_AUDIO_DELAY, "audio_delay", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
   { MP_CMD_QUIT, "quit", 0, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
   { MP_CMD_PAUSE, "pause", 0, { {-1,{0}} } },
+  { MP_CMD_FRAME_STEP, "frame_step", 0, { {-1,{0}} } },
   { MP_CMD_GRAB_FRAMES, "grab_frames",0, { {-1,{0}} }  },
   { MP_CMD_PLAY_TREE_STEP, "pt_step",1, { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT ,{0}}, {-1,{0}} } },
   { MP_CMD_PLAY_TREE_UP_STEP, "pt_up_step",1,  { { MP_CMD_ARG_INT,{0} }, { MP_CMD_ARG_INT ,{0}}, {-1,{0}} } },
--- a/input/input.h	Tue Oct 12 21:31:32 2004 +0000
+++ b/input/input.h	Tue Oct 12 22:10:56 2004 +0000
@@ -57,6 +57,7 @@
 #define MP_CMD_VO_ROOTWIN 53
 #define MP_CMD_SWITCH_VSYNC 54
 #define MP_CMD_SWITCH_RATIO 55
+#define MP_CMD_FRAME_STEP 56
 
 #define MP_CMD_GUI_EVENTS       5000
 #define MP_CMD_GUI_LOADFILE     5001
--- a/mplayer.c	Tue Oct 12 21:31:32 2004 +0000
+++ b/mplayer.c	Tue Oct 12 22:10:56 2004 +0000
@@ -2597,6 +2597,7 @@
       osd_show_av_delay = 9;
       if(sh_audio) sh_audio->delay+= v;
     } break;
+    case MP_CMD_FRAME_STEP :
     case MP_CMD_PAUSE : {
       osd_function=OSD_PAUSE;
       brk_cmd = 1;