summaryrefslogtreecommitdiffstats
path: root/video/out/vo.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-26 20:31:26 +0200
committerwm4 <wm4@nowhere>2014-07-26 20:31:26 +0200
commit760548da286400534017e885af123fffeb6cc707 (patch)
tree0fbfcc64d8b23b84e7d0221be0cbe0390e07d650 /video/out/vo.c
parent3f268cc4f2a498f909f9199b1683d2c6eb285af8 (diff)
downloadmpv-760548da286400534017e885af123fffeb6cc707.tar.bz2
mpv-760548da286400534017e885af123fffeb6cc707.tar.xz
vo: hack to avoid threading issues with mouse input
VO backends which are or will run in their own thread have a problem with vo_mouse_movement() calling vo_control(). Restrict this to VOs which actually need this.
Diffstat (limited to 'video/out/vo.c')
-rw-r--r--video/out/vo.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index cbf06a98df..f7dafa2735 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -416,7 +416,8 @@ void vo_mouse_movement(struct vo *vo, int posx, int posy)
if (!vo->opts->enable_mouse_movements)
return;
float p[2] = {posx, posy};
- vo_control(vo, VOCTRL_WINDOW_TO_OSD_COORDS, p);
+ if (vo->driver->caps & VO_CAP_EVIL_OSD)
+ vo_control(vo, VOCTRL_WINDOW_TO_OSD_COORDS, p);
mp_input_set_mouse_pos(vo->input_ctx, p[0], p[1]);
}