diff options
| author | wm4 <wm4@nowhere> | 2013-07-02 14:04:36 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-02 14:11:31 +0200 |
| commit | d603e73c24d6d7ad08a54c10d16c83d93b01a007 (patch) | |
| tree | 1ff7c913e0c198961f23ddcbc2e271ce9ed2fe16 /video/out/w32_common.c | |
| parent | 70a8079c8e0109eb89db3f3278be2a75a710c95e (diff) | |
| download | mpv-d603e73c24d6d7ad08a54c10d16c83d93b01a007.tar.bz2 mpv-d603e73c24d6d7ad08a54c10d16c83d93b01a007.tar.xz | |
core: cleanup more mp_fifo leftovers
Now only the OSX and Wayland parts are using this.
Diffstat (limited to 'video/out/w32_common.c')
| -rw-r--r-- | video/out/w32_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/video/out/w32_common.c b/video/out/w32_common.c index 13ec8e7053..9ce0174320 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -29,7 +29,7 @@ #include "vo.h" #include "aspect.h" #include "w32_common.h" -#include "core/mp_fifo.h" +#include "core/input/input.h" #include "osdep/io.h" #include "talloc.h" @@ -171,7 +171,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, } break; case WM_CLOSE: - mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN); + mp_input_put_key(vo->input_ctx, MP_KEY_CLOSE_WIN); break; case WM_SYSCOMMAND: switch (wParam) { @@ -188,7 +188,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, case WM_SYSKEYDOWN: { int mpkey = lookup_keymap_table(vk_map, wParam); if (mpkey) - mplayer_put_key(vo->key_fifo, mpkey | mod_state(vo)); + mp_input_put_key(vo->input_ctx, mpkey | mod_state(vo)); if (wParam == VK_F10) return 0; break; @@ -211,7 +211,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, && !key_state(vo, VK_RETURN)) code = code - 1 + (mods & MP_KEY_MODIFIER_SHIFT ? 'A' : 'a'); if (code >= 32 && code < (1<<21)) { - mplayer_put_key(vo->key_fifo, code | mods); + mp_input_put_key(vo->input_ctx, code | mods); // At least with Alt+char, not calling DefWindowProcW stops // Windows from emitting a beep. return 0; @@ -266,7 +266,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, SendMessage(hWnd, WM_NCLBUTTONDOWN, HTCAPTION, 0); return 0; } - mplayer_put_key(vo->key_fifo, mouse_button); + mp_input_put_key(vo->input_ctx, mouse_button); } return DefWindowProcW(hWnd, message, wParam, lParam); @@ -313,7 +313,7 @@ int vo_w32_check_events(struct vo *vo) MoveWindow(w32->window, 0, 0, r.right, r.bottom, FALSE); if (!IsWindow(WIN_ID_TO_HWND(vo->opts->WinID))) // Window has probably been closed, e.g. due to program crash - mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN); + mp_input_put_key(vo->input_ctx, MP_KEY_CLOSE_WIN); } return w32->event_flags; |