diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 19:22:56 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 19:23:32 +0300 |
| commit | f38efd166e43f5cae783f38f9913d2859557143e (patch) | |
| tree | 38f49af429d4147e390f0b52384294b2e35b9d6f /libvo/vo_corevideo.m | |
| parent | 7a33e76943ecc3f2ba185a1bea56c8416b74d6dd (diff) | |
| parent | 4e853e19ef349a453ef069d76b830a3dbfa444c3 (diff) | |
| download | mpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.bz2 mpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.xz | |
Merge svn changes up to r31097
Diffstat (limited to 'libvo/vo_corevideo.m')
| -rw-r--r-- | libvo/vo_corevideo.m | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m index 17086e7cb8..e40ae9c20b 100644 --- a/libvo/vo_corevideo.m +++ b/libvo/vo_corevideo.m @@ -83,7 +83,6 @@ static uint32_t image_format; static int isFullscreen; static int isOntop; static int isRootwin; -extern int enable_mouse_movements; static float winAlpha = 1; static int int_pause = 0; @@ -954,11 +953,8 @@ static int control(uint32_t request, void *data) if (enable_mouse_movements && !isRootwin) { NSPoint p =[self convertPoint:[theEvent locationInWindow] fromView:nil]; if ([self mouse:p inRect:textureFrame]) { - char cmdstr[40]; - snprintf(cmdstr, sizeof(cmdstr), "set_mouse_pos %i %i", - (int)(vo_fs ? p.x : (p.x - textureFrame.origin.x)), - (int)(vo_fs ? [self frame].size.height - p.y: (NSMaxY(textureFrame) - p.y))); - mp_input_queue_cmd(global_vo->input_ctx, mp_input_parse_cmd(cmdstr)); + vo_mouse_movement(global_vo, vo_fs ? p.x : p.x - textureFrame.origin.x, + vo_fs ? [self frame].size.height - p.y : NSMaxY(textureFrame) - p.y); } } } |