Author: tom
Date: Tue Oct 28 08:10:10 2008
New Revision: 3222
URL: http://svn.slimdevices.com?rev=3222&root=Jive&view=rev
Log:
Bug 9831:
Description:
added keyboard shortcuts for hold actions
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua?rev=3222&root=Jive&r1=3221&r2=3222&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua Tue Oct 28
08:10:10 2008
@@ -98,25 +98,29 @@
local _idTranslations = {}
local keyboardShortcuts = {
- ["i"] = KEY_UP,
- ["k"] = KEY_DOWN,
- ["j"] = KEY_LEFT,
- ["l"] = KEY_RIGHT,
- ["h"] = KEY_HOME,
- ["p"] = KEY_PLAY,
- ["x"] = KEY_PLAY,
- ["c"] = KEY_PAUSE,
- [" "] = KEY_PAUSE,
- ["a"] = KEY_ADD,
- ["z"] = KEY_REW,
- ["<"] = KEY_REW,
- ["b"] = KEY_FWD,
- [">"] = KEY_FWD,
- ["+"] = KEY_VOLUME_UP,
- ["="] = KEY_VOLUME_UP,
- ["-"] = KEY_VOLUME_DOWN,
- ["\b"] = KEY_BACK, -- BACKSPACE
- ["\27"] = KEY_BACK -- ESC
+ ["i"] = { keyCode = KEY_UP, event = EVENT_KEY_PRESS },
+ ["k"] = { keyCode = KEY_DOWN, event = EVENT_KEY_PRESS },
+ ["j"] = { keyCode = KEY_LEFT, event = EVENT_KEY_PRESS },
+ ["l"] = { keyCode = KEY_RIGHT, event = EVENT_KEY_PRESS },
+ ["h"] = { keyCode = KEY_HOME, event = EVENT_KEY_PRESS },
+ ["p"] = { keyCode = KEY_PLAY, event = EVENT_KEY_PRESS },
+ ["P"] = { keyCode = KEY_PLAY, event = EVENT_KEY_HOLD },
+ ["x"] = { keyCode = KEY_PLAY, event = EVENT_KEY_PRESS },
+ ["c"] = { keyCode = KEY_PAUSE, event = EVENT_KEY_PRESS },
+ [" "] = { keyCode = KEY_PAUSE, event = EVENT_KEY_PRESS },
+ ["a"] = { keyCode = KEY_ADD, event = EVENT_KEY_PRESS },
+ ["A"] = { keyCode = KEY_ADD, event = EVENT_KEY_HOLD },
+ ["z"] = { keyCode = KEY_REW, event = EVENT_KEY_PRESS },
+ ["Z"] = { keyCode = KEY_REW, event = EVENT_KEY_HOLD },
+ ["<"] = { keyCode = KEY_REW, event = EVENT_KEY_PRESS },
+ ["b"] = { keyCode = KEY_FWD, event = EVENT_KEY_PRESS },
+ ["B"] = { keyCode = KEY_FWD, event = EVENT_KEY_HOLD },
+ [">"] = { keyCode = KEY_FWD, event = EVENT_KEY_PRESS },
+ ["+"] = { keyCode = KEY_VOLUME_UP, event = EVENT_KEY_PRESS },
+ ["="] = { keyCode = KEY_VOLUME_UP, event = EVENT_KEY_PRESS },
+ ["-"] = { keyCode = KEY_VOLUME_DOWN, event = EVENT_KEY_PRESS },
+ ["\b"] = { keyCode = KEY_BACK, event = EVENT_KEY_PRESS }, -- BACKSPACE
+ ["\27"] = { keyCode = KEY_BACK, event = EVENT_KEY_PRESS } -- ESC
}
local _defaultSkin
@@ -130,9 +134,9 @@
log:debug("Keyboard entry: ", keyboardEntry)
- local keyCode = keyboardShortcuts[keyboardEntry]
+ local keyCode = keyboardShortcuts[keyboardEntry].keyCode
if (keyCode) then
- Framework:pushEvent(Event:new(EVENT_KEY_PRESS, keyCode))
+
Framework:pushEvent(Event:new(keyboardShortcuts[keyboardEntry].event, keyCode))
end
return EVENT_CONSUME
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
