diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-30 13:00:59 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-30 14:46:21 +0300 |
| commit | 423b95bf5cc46da5952a907fa565c0c7119724f0 (patch) | |
| tree | 1bca5f4ac7cb5fb0d17cabcee6708d23ced2cb99 /libvo | |
| parent | f7b608812ea637f89d9f9e860982940fd7101495 (diff) | |
| download | mpv-423b95bf5cc46da5952a907fa565c0c7119724f0.tar.bz2 mpv-423b95bf5cc46da5952a907fa565c0c7119724f0.tar.xz | |
input: Move cmd_queue to context struct
Menu instances now also need a input context pointer to queue commands.
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_macosx.m | 2 | ||||
| -rw-r--r-- | libvo/w32_common.c | 2 | ||||
| -rw-r--r-- | libvo/x11_common.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m index 93db462461..2fe61dd612 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_macosx.m @@ -1009,7 +1009,7 @@ static int control(uint32_t request, void *data) 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(mp_input_parse_cmd(cmdstr)); + mp_input_queue_cmd(global_vo->input_ctx, mp_input_parse_cmd(cmdstr)); } } } diff --git a/libvo/w32_common.c b/libvo/w32_common.c index 82cd9c94a1..b45b06cfbc 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -137,7 +137,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l char cmd_str[40]; snprintf(cmd_str, sizeof(cmd_str), "set_mouse_pos %i %i", GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); - mp_input_queue_cmd(mp_input_parse_cmd(cmd_str)); + mp_input_queue_cmd(global_vo->input_ctx, mp_input_parse_cmd(cmd_str)); } break; case WM_MOUSEWHEEL: diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 85ed754958..ec48f16ff6 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -1063,7 +1063,8 @@ int vo_x11_check_events(struct vo *vo) { char cmd_str[40]; sprintf(cmd_str,"set_mouse_pos %i %i",Event.xmotion.x, Event.xmotion.y); - mp_input_queue_cmd(mp_input_parse_cmd(cmd_str)); + mp_input_queue_cmd(vo->input_ctx, + mp_input_parse_cmd(cmd_str)); } if (x11->vo_mouse_autohide) |