diff options
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 4 | ||||
| -rw-r--r-- | DOCS/tech/slave.txt | 3 | ||||
| -rw-r--r-- | etc/input.conf | 1 | ||||
| -rw-r--r-- | input/input.c | 1 | ||||
| -rw-r--r-- | input/input.h | 1 | ||||
| -rw-r--r-- | mplayer.c | 1 |
6 files changed, 11 insertions, 0 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index e58cfdb8cb..6acb7b49e0 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -227,6 +227,10 @@ next/\:previous playtree entry in the parent list 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 -" diff --git a/DOCS/tech/slave.txt b/DOCS/tech/slave.txt index c0686c5d64..9184f23ae9 100644 --- a/DOCS/tech/slave.txt +++ b/DOCS/tech/slave.txt @@ -28,6 +28,9 @@ quit [<value>] pause Pause/unpause the playback. +frame_step + Play one frame, then pause again. + grab_frames ??? diff --git a/etc/input.conf b/etc/input.conf index 50a2d81978..ebd0552841 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -19,6 +19,7 @@ q quit ESC quit ENTER pt_step 1 1 p pause +s frame_step SPACE pause HOME pt_up_step 1 END pt_up_step -1 diff --git a/input/input.c b/input/input.c index d2e4833bca..951d03583e 100644 --- a/input/input.c +++ b/input/input.c @@ -57,6 +57,7 @@ static mp_cmd_t mp_cmds[] = { { 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}} } }, diff --git a/input/input.h b/input/input.h index 1c218aaa2a..4a2a10098d 100644 --- a/input/input.h +++ b/input/input.h @@ -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 @@ -2597,6 +2597,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) 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; |