From 8cb56e3105bb44eb785aa767df828fec61e28a52 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Tue, 3 Aug 2010 21:13:47 +0200 Subject: [PATCH] lua: fix hotkeys demo file. --- share/lua/intf/hotkeys.lua | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/share/lua/intf/hotkeys.lua b/share/lua/intf/hotkeys.lua index e2bb5a7d7a..57e52285ed 100644 --- a/share/lua/intf/hotkeys.lua +++ b/share/lua/intf/hotkeys.lua @@ -39,7 +39,7 @@ bindings = { function quit() print("Bye-bye!") - vlc.quit() + vlc.misc.quit() end function demo() @@ -74,22 +74,16 @@ function action_trigger( action ) print("action_trigger:",tostring(action)) local a = actions[action] if a then - local date = vlc.misc.mdate() - if a.delta and date > a.last + a.delta then - a.times = 0 - else - a.times = a.times + 1 + local ok, msg = pcall( a.func ) + if not ok then + vlc.msg.err("Error while executing action `".. tostring(action) .."': "..msg) end - a.last = date - table.insert(queue,action) - vlc.misc.signal() else vlc.msg.err("Key `"..key.."' points to unknown action `"..bindings[key].."'.") end end -function key_press( var, old, new, data ) - local key = new +function key_press( var, old, key, data ) print("key_press:",tostring(key)) if bindings[key] then action_trigger(bindings[key]) @@ -101,17 +95,7 @@ end vlc.var.add_callback( vlc.object.libvlc(), "key-pressed", key_press ) --vlc.var.add_callback( vlc.object.libvlc(), "action-triggered", action_trigger ) -while not die do - if #queue ~= 0 then - local action = actions[queue[1]] - local ok, msg = pcall( action.func ) - if not ok then - vlc.msg.err("Error while executing action `"..queue[1].."': "..msg) - end - table.remove(queue,1) - else - die = vlc.misc.lock_and_wait() - end +while not vlc.misc.lock_and_wait() do end -- Clean up -- 2.39.2