video: separate screenshot modes

Use different VOCTRLs for "window" and normal screenshot modes. The
normal one will probably be removed, and replaced by generic code in
vo.c, and this commit is preparation for this. (Doing it the other way
around would be slightly simpler, but I haven't decided yet about the
second one, and touching every VO is needed anyway in order to remove
the unneeded crap. E.g. has_osd has been unused for a long time.)

1 files changed, 4 insertions, 20 deletions

diff --git a/video/out/vo.h b/video/out/vo.h
index 281152352d..9ae489e2cd 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -97,7 +97,10 @@ enum mp_voctrl {
     // imgfmt/w/h/d_w/d_h can be omitted for convenience.
     VOCTRL_GET_COLORSPACE,              // struct mp_image_params*
 
-    VOCTRL_SCREENSHOT,                  // struct voctrl_screenshot_args*
+    // Retrieve original image.
+    VOCTRL_SCREENSHOT,                  // struct mp_image**
+    // Retrieve window contents.
+    VOCTRL_SCREENSHOT_WIN,              // struct mp_image**
 
     VOCTRL_SET_COMMAND_LINE,            // char**
 
@@ -120,25 +123,6 @@ struct voctrl_get_equalizer_args {
     int *valueptr;
 };
 
-// VOCTRL_SCREENSHOT
-struct voctrl_screenshot_args {
-    // 0: Save image of the currently displayed video frame, in original
-    //    resolution.
-    // 1: Save full screenshot of the window. Should contain OSD, EOSD, and the
-    //    scaled video.
-    // The value of this variable can be ignored if only a single method is
-    // implemented.
-    int full_window;
-    // Will be set to a newly allocated image, that contains the screenshot.
-    // The caller has to free the image with talloc_free().
-    // It is not specified whether the image data is a copy or references the
-    // image data directly.
-    // Can be NULL on failure.
-    struct mp_image *out_image;
-    // Whether the VO rendered OSD/subtitles into out_image
-    bool has_osd;
-};
-
 // VOCTRL_GET_WIN_STATE
 #define VO_WIN_STATE_MINIMIZED 1