summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-24 10:33:55 +0100
committerwm4 <wm4@nowhere>2014-11-24 10:33:55 +0100
commit2a017734a53886568aafc2515b291bd96253e4dc (patch)
tree9cb0a659b4dee0622fcb4992e63d5642c2c7bb96
parent5bbd734fffde5f0d689216c07dfeb3508aeb1f57 (diff)
downloadmpv-2a017734a53886568aafc2515b291bd96253e4dc.tar.bz2
mpv-2a017734a53886568aafc2515b291bd96253e4dc.tar.xz
lua, ipc: remove leftovers
MPV_EVENT_SCRIPT_INPUT_DISPATCH is now unused/deprecated. Also remove a debug-print from defaults.lua.
-rw-r--r--input/ipc.c9
-rw-r--r--player/lua.c9
-rw-r--r--player/lua/defaults.lua1
3 files changed, 0 insertions, 19 deletions
diff --git a/input/ipc.c b/input/ipc.c
index 028ef7c7ab..876f40c8a7 100644
--- a/input/ipc.c
+++ b/input/ipc.c
@@ -181,15 +181,6 @@ static void mpv_event_to_node(void *ta_parent, mpv_event *event, mpv_node *dst)
break;
}
- case MPV_EVENT_SCRIPT_INPUT_DISPATCH: {
- mpv_event_script_input_dispatch *msg = event->data;
-
- mpv_node_map_add_int64(ta_parent, dst, "arg0", msg->arg0);
- mpv_node_map_add_string(ta_parent, dst, "type", msg->type);
-
- break;
- }
-
case MPV_EVENT_CLIENT_MESSAGE: {
mpv_event_client_message *msg = event->data;
diff --git a/player/lua.c b/player/lua.c
index cdcd2a2443..d2990c3b28 100644
--- a/player/lua.c
+++ b/player/lua.c
@@ -517,15 +517,6 @@ static int script_wait_event(lua_State *L)
lua_setfield(L, -2, "text"); // event
break;
}
- case MPV_EVENT_SCRIPT_INPUT_DISPATCH: {
- mpv_event_script_input_dispatch *msg = event->data;
-
- lua_pushinteger(L, msg->arg0); // event i
- lua_setfield(L, -2, "arg0"); // event
- lua_pushstring(L, msg->type); // event s
- lua_setfield(L, -2, "type"); // event
- break;
- }
case MPV_EVENT_CLIENT_MESSAGE: {
mpv_event_client_message *msg = event->data;
diff --git a/player/lua/defaults.lua b/player/lua/defaults.lua
index 812bb71afe..7e038dfbb8 100644
--- a/player/lua/defaults.lua
+++ b/player/lua/defaults.lua
@@ -84,7 +84,6 @@ function mp.set_key_bindings(list, section, flags)
elseif event == "u" and cb_up then
cb_up()
elseif event == def and cb then
- print("whooo")
cb()
end
end