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, 6 insertions, 8 deletions

diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index 293eff55fe..5b4fb7856a 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -1260,14 +1260,12 @@ static int control(struct vo *vo, uint32_t request, void *data)
         return VO_TRUE;
     case VOCTRL_GET_PANSCAN:
         return VO_TRUE;
-    case VOCTRL_SCREENSHOT: {
-        struct voctrl_screenshot_args *args = data;
-        if (args->full_window)
-            args->out_image = get_window_screenshot(priv);
-        else
-            args->out_image = get_screenshot(priv);
-        return !!args->out_image;
-    }
+    case VOCTRL_SCREENSHOT:
+        *(struct mp_image **)data = get_screenshot(priv);
+        return VO_TRUE;
+    case VOCTRL_SCREENSHOT_WIN:
+        *(struct mp_image **)data = get_window_screenshot(priv);
+        return VO_TRUE;
     }
 
     int events = 0;