diff options
| author | wm4 <wm4@nowhere> | 2018-05-09 22:38:21 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2018-05-24 19:56:34 +0200 |
| commit | a4321cf6877f47a381ff40bea73ca2934635ea58 (patch) | |
| tree | 781a87047b16653f92f234b4f61786f6c369411e /etc | |
| parent | 059e7fdb3aaace0c6259728547da1896249818e4 (diff) | |
| download | mpv-a4321cf6877f47a381ff40bea73ca2934635ea58.tar.bz2 mpv-a4321cf6877f47a381ff40bea73ca2934635ea58.tar.xz | |
screenshot: change async behavior to be in line with new semantics
Basically reimplement the async behavior on top of the async command
code. With this, all screenshot commands are async, and the "async"
prefix basically does nothing. The prefix now behaves exactly like with
other commands that use spawn_thread.
This also means using the prefix in the preset input.conf is pointless
(without effect) and misleading, so remove that.
The each_frame mode was actually particularly painful in making this
change, since the player wants to block for it when writing a
screenshot, and generally doesn't fit into the new infrastructure. It
was still relatively easy to reimplement by copying the original command
and then repeating it on each frame. The waiting is reentrant now, so
move the call in video.c to a "safer" spot.
One way to observe how the new semantics interact with everything is
using the mpv repl script and sending a screenshot command through it.
Without async flag, the script will freeze while writing the screenshot
(while playback continues), while with async flag it continues.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/input.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/input.conf b/etc/input.conf index 60cd77cc41..5a9aaccf78 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -133,9 +133,9 @@ #_ cycle video #T cycle ontop # toggle video window ontop of other windows #f cycle fullscreen # toggle fullscreen -#s async screenshot # take a screenshot -#S async screenshot video # ...without subtitles -#Ctrl+s async screenshot window # ...with subtitles and OSD, and scaled +#s screenshot # take a screenshot +#S screenshot video # ...without subtitles +#Ctrl+s screenshot window # ...with subtitles and OSD, and scaled #Alt+s screenshot each-frame # automatically screenshot every frame #w add panscan -0.1 # zoom out with -panscan 0 -fs #W add panscan +0.1 # in |